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