Merge pull request #10120 from seamuslee001/CRM-19741
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 6 Apr 2017 06:07:08 +0000 (18:07 +1200)
committerGitHub <noreply@github.com>
Thu, 6 Apr 2017 06:07:08 +0000 (18:07 +1200)
CRM-19741 Add back in fix and add in unit tests to lock in fix


Trivial merge