Merge pull request #4219 from eileenmcnaughton/4.5
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 24 Sep 2014 07:00:57 +0000 (19:00 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Wed, 24 Sep 2014 07:00:57 +0000 (19:00 +1200)
merge changes from 4.4


Trivial merge