Bugfix.
Merge pull request #7134 from Segrain/dev

Bugfix.