Merge pull request #1072 from trv6/4.1-dev

MsJans clone
Merge pull request #1 from Windower/4.1-dev

Merge pull request #1072 from trv6/4.1-dev