Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-14-11-04-09

Conflicts:
	CRM/Core/Payment/PayPalImpl.php
	sql/civicrm_generated.mysql
	tests/phpunit/api/v3/SyntaxConformanceTest.php
	xml/templates/civicrm_sample.tpl

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

diff --cc CRM/Core/BAO/LocationType.php
Simple merge

diff --cc CRM/Core/Payment/PayPalImpl.php
Simple merge

diff --cc CRM/Mailing/Info.php
Simple merge

diff --cc tests/phpunit/api/v3/SyntaxConformanceTest.php
index d5087c88304887b8e172ec84276330e0d103d3ee,aa403ce360853ccc1d6675301c351cbc46df84bf..9e32034f4daa128f5f32e48d632b364d5ceaada3
--- 1/tests/phpunit/api/v3/SyntaxConformanceTest.php
--- 2/tests/phpunit/api/v3/SyntaxConformanceTest.php
+++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@@ -566,18 -563,15 +564,27 @@@ class api_v3_SyntaxConformanceTest exte
            'pcp_id',
          ),
        ),
 +      'Email' => array(
 +        'cant_update' => array(
 +          // This is being legitimately manipulated to always have a valid primary - skip.
 +          'is_primary',
 +        ),
 +      ),
 +      'Navigation' => array(
 +        'cant_update' => array(
 +          // Weight is deliberately altered when this is changed - skip.
 +          'parent_id',
 +        ),
 +      ),
+       'LocationType' => array(
+         'cant_update' => array(
+           // I'm on the fence about whether the test should skip or the behaviour is wrong.
+           // display_name is set to match name if display_name is not provided. It would be more 'normal'
+           // to only calculate a default IF id is not set - but perhaps the current behaviour is kind
+           // of what someone updating the name expects..
+           'name',
+         ),
+       ),
        'Pledge' => array(
          'cant_update' => array(
            'pledge_original_installment_amount',