Merge pull request #12099 from civicrm/5.2
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 8 May 2018 12:05:23 +0000 (00:05 +1200)
committerGitHub <noreply@github.com>
Tue, 8 May 2018 12:05:23 +0000 (00:05 +1200)
5.2 to master


Trivial merge