Pull request for issue #280

Fixes #280. Generated by conveyor-workflow.