Merge remote-tracking branch 'origin/master' into prendota/plugin-manager-new-protocol