Properly manage "update" for mercurial
Fix branch move
Merge branch 'notifications'