Pull request for issue #290

Fixes #290. Generated by conveyor-workflow.