Merge pull request #9792 from h-c-c/CRM-19945
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 6 Feb 2017 08:32:10 +0000 (21:32 +1300)
committerGitHub <noreply@github.com>
Mon, 6 Feb 2017 08:32:10 +0000 (21:32 +1300)
fix and test for CRM-19945


Trivial merge