Merge pull request #10283 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Sat, 29 Apr 2017 23:00:57 +0000 (11:00 +1200)
committerGitHub <noreply@github.com>
Sat, 29 Apr 2017 23:00:57 +0000 (11:00 +1200)
Merge 4.7.19-rc to master


Trivial merge