Version bumps
Merge branch 'master' into quality-option