Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fixing notification style update
Merge pull request #2583 from awesomerobot/master

fixing notification style update