Merge branch 'CRM-15474' of github.com:colemanw/civicrm-core into CRM-15527