Merge pull request #7881 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 29 Feb 2016 04:38:14 +0000 (17:38 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 29 Feb 2016 04:38:14 +0000 (17:38 +1300)
Test fixes, tests were failing when run in isolation due to inconsist…


Trivial merge