Merge pull request #5011 from eileenmcnaughton/rebase2
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 27 Jan 2015 07:40:47 +0000 (20:40 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 27 Jan 2015 07:40:47 +0000 (20:40 +1300)
additional test and test tidy-ups


Trivial merge