Merge pull request #10559 from civicrm/4.7.21-rc
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 25 Jun 2017 22:30:19 +0000 (10:30 +1200)
committerGitHub <noreply@github.com>
Sun, 25 Jun 2017 22:30:19 +0000 (10:30 +1200)
4.7.21 rc


Trivial merge