Merge pull request #10593 from civicrm/4.7.21-rc
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 2 Jul 2017 20:41:10 +0000 (08:41 +1200)
committerGitHub <noreply@github.com>
Sun, 2 Jul 2017 20:41:10 +0000 (08:41 +1200)
4.7.21 rc


Trivial merge