Merge pull request #1796 from Azaezel/notSoEasy