Merge pull request #3749 from Segrain/master

Smallfixes.