Merge branch 'master' into contact
Merge branch 'contact'