Merge pull request #7284 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 24 Nov 2015 03:59:58 +0000 (16:59 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 24 Nov 2015 03:59:58 +0000 (16:59 +1300)
code comments


Trivial merge