Merge in sauce lab changes
Merge branch 'master' into release
Image upload bugfix
Merge branch 'master' into release