Pull request for issue #316

Fixes #316. Generated by conveyor-workflow.