Merge branch 'master' into viper
Merge remote-tracking branch 'mmusial/viper' into viper