Upgrade bug fixes
Merge branch 'master' into Jonte
merge confs