Merge branch '4.7.19-rc' of https://github.com/civicrm/civicrm-core
authoreileen <emcnaughton@wikimedia.org>
Sat, 29 Apr 2017 02:40:52 +0000 (14:40 +1200)
committereileen <emcnaughton@wikimedia.org>
Sat, 29 Apr 2017 02:40:52 +0000 (14:40 +1200)

Trivial merge