Merge pull request #8909 from tschuettler/patch-4
authorEileen McNaughton <eileen@mcnaughty.com>
Fri, 19 Aug 2016 22:16:38 +0000 (10:16 +1200)
committerGitHub <noreply@github.com>
Fri, 19 Aug 2016 22:16:38 +0000 (10:16 +1200)
CRM-19248


Trivial merge