Merge pull request #10044 from eileenmcnaughton/4.7.18rc
authorEileen McNaughton <eileen@mcnaughty.com>
Fri, 24 Mar 2017 01:08:58 +0000 (14:08 +1300)
committerGitHub <noreply@github.com>
Fri, 24 Mar 2017 01:08:58 +0000 (14:08 +1300)
Minor test tidy up.


Trivial merge