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

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

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

diff --cc CRM/Member/BAO/Membership.php
Simple merge

diff --cc CRM/Utils/PDF/Utils.php
Simple merge

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