Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-12233