Merge pull request #6509 from eileenmcnaughton/test-fixes
authorEileen McNaughton <eileen@mcnaughty.com>
Sat, 15 Aug 2015 22:35:46 +0000 (10:35 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Sat, 15 Aug 2015 22:35:46 +0000 (10:35 +1200)
Test fixes


Trivial merge