Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-06-19-31-58

Conflicts:
	CRM/Upgrade/Incremental/php/FourSix.php
	sql/civicrm_generated.mysql
	xml/version.xml

diff --cc CRM/Core/Controller.php
Simple merge

diff --cc CRM/Core/Form.php
Simple merge

diff --cc CRM/Report/Form/Mailing/Summary.php
Simple merge

diff --cc CRM/Upgrade/Incremental/php/FourSix.php
Simple merge

diff --cc Civi/API/Subscriber/ChainSubscriber.php
Simple merge

diff --cc tests/phpunit/api/v3/ContactTest.php
Simple merge

diff --cc tests/phpunit/api/v3/EventTest.php
Simple merge