Pull request for issue #587

Fixes #587. Generated by conveyor-workflow.