Merge pull request #5008 from eileenmcnaughton/rebase
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 27 Jan 2015 01:44:27 +0000 (14:44 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 27 Jan 2015 01:44:27 +0000 (14:44 +1300)
Rebase of some of the tidyups from other PR


Trivial merge