Revert 'Merge master branch'