Merge branch 'master' into contact_dialog