Merged in 1017 (pull request #565)
This is a solution for issue #1017 - simply a cleanup before release.
This is a solution for issue #1017 - simply a cleanup before release.