Merge pull request #5980 from marcov4lente/CRM-15829+CRM15881-for-4.6
authorDave Greenberg <dave@civicrm.org>
Wed, 10 Jun 2015 20:30:47 +0000 (13:30 -0700)
committerDave Greenberg <dave@civicrm.org>
Wed, 10 Jun 2015 20:30:47 +0000 (13:30 -0700)
CRM-15829 and CRM-15881 for 4.6


Trivial merge