Merge branch 'master' into dev
Fixed 'Mailing_List' Conflict
Merge branch 'dev'