Merge pull request #9431 from monishdeb/CRM-19676
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 23 Nov 2016 01:10:28 +0000 (14:10 +1300)
committerGitHub <noreply@github.com>
Wed, 23 Nov 2016 01:10:28 +0000 (14:10 +1300)
CRM-19676: fix how params are merged


Trivial merge