Pull request for issue #282

Fixes #282. Generated by conveyor-workflow.