Merge pull request #10600 from civicrm/4.7.21-rc
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 4 Jul 2017 04:43:20 +0000 (16:43 +1200)
committerGitHub <noreply@github.com>
Tue, 4 Jul 2017 04:43:20 +0000 (16:43 +1200)
4.7.21 rc


Trivial merge