Merge pull request #6167 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 8 Jul 2015 09:14:27 +0000 (21:14 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Wed, 8 Jul 2015 09:14:27 +0000 (21:14 +1200)
Fix e-notice & add tests around where e-notice was


Trivial merge