Merge pull request #2131 from unxed/dev