Pull request for issue #516

Fixes #516. Generated by conveyor-workflow.