Merge pull request #12089 from civicrm/5.2
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 6 May 2018 22:57:34 +0000 (10:57 +1200)
committerGitHub <noreply@github.com>
Sun, 6 May 2018 22:57:34 +0000 (10:57 +1200)
5.2 to master


Trivial merge