Merge pull request #11791 from civicrm/4.7.31-rc
authorTim Otten <totten@civicrm.org>
Fri, 9 Mar 2018 00:04:47 +0000 (16:04 -0800)
committerGitHub <noreply@github.com>
Fri, 9 Mar 2018 00:04:47 +0000 (16:04 -0800)
4.7.31 rc


Trivial merge