Merge pull request #8933 from ejegg/mergeNotices
authorEileen McNaughton <eileen@mcnaughty.com>
Fri, 26 Aug 2016 02:40:52 +0000 (14:40 +1200)
committerGitHub <noreply@github.com>
Fri, 26 Aug 2016 02:40:52 +0000 (14:40 +1200)
Fix undefined index notices in merge


Trivial merge