Merge pull request #3551 from Segrain/master

Pulling fixes.
Fix for #3552.