Merge branch '4.6' into master

diff --cc CRM/Contact/BAO/Group.php
Simple merge

diff --cc CRM/Contact/Form/Search/Advanced.php
Simple merge

diff --cc CRM/Contact/Form/Task.php
Simple merge

diff --cc CRM/Contribute/BAO/ContributionPage.php
Simple merge

diff --cc CRM/Event/BAO/Event.php
Simple merge

diff --cc api/v3/utils.php
Simple merge

diff --cc templates/CRM/Group/Form/Search.tpl
Simple merge

diff --cc tests/phpunit/WebTest/Contribute/PCPAddTest.php
Simple merge