Merge remote-tracking branch 'bui/master' into uploader
Merge remote-tracking branch 'origin/uploader' into uploader