Version 0.91.6
Merge branch 'master' into work092