Merge pull request #7504 from colemanw/fixes
authorcolemanw <coleman@civicrm.org>
Mon, 28 Dec 2015 19:15:21 +0000 (14:15 -0500)
committercolemanw <coleman@civicrm.org>
Mon, 28 Dec 2015 19:15:21 +0000 (14:15 -0500)
Custom field fixes


Trivial merge