Merge branch 'bugfix'