Merge pull request #3471 from colemanw/master
authorcolemanw <coleman@civicrm.org>
Tue, 10 Jun 2014 19:37:48 +0000 (20:37 +0100)
committercolemanw <coleman@civicrm.org>
Tue, 10 Jun 2014 19:37:48 +0000 (20:37 +0100)
Fix CRM-14353 and CRM-14697


Trivial merge