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

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

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

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

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

diff --cc templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
Simple merge