Merge pull request #12814 from civicrm/5.6
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 12 Sep 2018 22:14:18 +0000 (10:14 +1200)
committerGitHub <noreply@github.com>
Wed, 12 Sep 2018 22:14:18 +0000 (10:14 +1200)
5.6 to master


Trivial merge