Merge pull request #11651 from civicrm/4.7.30-rc
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 7 Feb 2018 20:03:06 +0000 (09:03 +1300)
committerGitHub <noreply@github.com>
Wed, 7 Feb 2018 20:03:06 +0000 (09:03 +1300)
4.7.30 rc merge to master


Trivial merge