Merge branch 'ronald/edit-contact-page'
Merge branch 'ronald/edit-contact-page'
Merge branch 'master' into ronald/edit-contact-page