Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-02-11-04-42

Conflicts:
	tests/phpunit/api/v3/SyntaxConformanceTest.php

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

diff --cc CRM/Contribute/Form/Task/Invoice.php
Simple merge

diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge

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

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

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

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