Merge pull request #6701 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 8 Sep 2015 05:46:48 +0000 (17:46 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 8 Sep 2015 05:46:48 +0000 (17:46 +1200)
enotice fix


Trivial merge