Merge branch 'master' into heavy-refactoring