Merge pull request #6724 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Fri, 11 Sep 2015 07:10:23 +0000 (19:10 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Fri, 11 Sep 2015 07:10:23 +0000 (19:10 +1200)
Test fixes


Trivial merge