Minor bugfix
Merge branch 'release/0.4.6.12'