Merge remote-tracking branch 'origin' into rlim/shortcut-in-jasmine