Merge pull request #7254 from monishdeb/CRM-17417
authorcolemanw <coleman@civicrm.org>
Thu, 19 Nov 2015 23:32:37 +0000 (18:32 -0500)
committercolemanw <coleman@civicrm.org>
Thu, 19 Nov 2015 23:32:37 +0000 (18:32 -0500)
CRM-17417 and CRM-17418 fixes


Trivial merge