Merge branch 'corone17-patch-1'