Merge pull request #1072 from trv6/4.1-dev