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)
commitffce287194f45fdc7081d8f73da084f205524724
treeae35b6a7eaaaaf662c28ec5a236c5588c71f8ffa
parentc7d488a016067dc2c7c3d4becfcac392d642cff9
parentb3cfe9a5fb94b1a15aab2ca4aaac8867d673c610
Merge pull request #10283 from eileenmcnaughton/master

Merge 4.7.19-rc to master