Pull request for issue #312

Fixes #312. Generated by conveyor-workflow.