CRM-13227, CRM-14744: full fix
Merge branch 'standalone' of https://github.com/cividesk/civicrm-core into standalone