Merge pull request #9440 from omarabuhussein/backporting-#5913
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 24 Jan 2017 10:49:35 +0000 (23:49 +1300)
committerGitHub <noreply@github.com>
Tue, 24 Jan 2017 10:49:35 +0000 (23:49 +1300)
CRM-16575: Backporting #5913


Trivial merge