Pull request for issue #1539

Fixes #1539. Generated by conveyor-workflow.