Merge pull request #3419 from eileenmcnaughton/test_fixes
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 20:08:10 +0000 (08:08 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 20:08:10 +0000 (08:08 +1200)
Syntax conformance test fixes


Trivial merge