Merge pull request #10526 from civicrm/4.7.21-rc
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 19 Jun 2017 01:41:51 +0000 (13:41 +1200)
committerGitHub <noreply@github.com>
Mon, 19 Jun 2017 01:41:51 +0000 (13:41 +1200)
4.7.21 rc


Trivial merge