issue #1110
Merged PR #1173.