Merge tag '4.6.14' of https://github.com/civicrm/civicrm-core into 4.6.14-fsf

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

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

diff --cc CRM/Contribute/Form/Contribution/Confirm.php
Simple merge

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

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