Pull request for issue #314

Fixes #314. Generated by conveyor-workflow.