Revert "Merge branch 'patch-1' into 'master'" This reverts merge request !19