CRM-10833
Merge branch 'master' of https://github.com/totten/org.civicrm.profilemockup