Merge pull request #6704 from monishdeb/46-test-fix
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 9 Sep 2015 01:44:55 +0000 (13:44 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Wed, 9 Sep 2015 01:44:55 +0000 (13:44 +1200)
4.6 Test fixes


Trivial merge