Merge pull request #13942 from civicrm/5.12
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 2 Apr 2019 20:37:03 +0000 (09:37 +1300)
committerGitHub <noreply@github.com>
Tue, 2 Apr 2019 20:37:03 +0000 (09:37 +1300)
5.12 to master


Trivial merge