merge from git@github.com:guillaumerose/notification-plugin.git master