Merge pull request #13818 from civicrm/5.12
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 13 Mar 2019 23:13:47 +0000 (12:13 +1300)
committerGitHub <noreply@github.com>
Wed, 13 Mar 2019 23:13:47 +0000 (12:13 +1300)
5.12 to master


Trivial merge