Bug fix

This is a bug fix on bugfix branch
Merge branch 'bugfix'