Merge pull request #3674 from eileenmcnaughton/test-fix
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 15 Jul 2014 22:41:09 +0000 (10:41 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 15 Jul 2014 22:41:09 +0000 (10:41 +1200)
Test fix


Trivial merge