Merge branch '4.5' of https://github.com/civicrm/civicrm-core into 4.6