Merge branch 'master' into travis-updates
add notifications settings
Merge branch 'travis-updates'