Pull request for issue #676

Fixes #676. Generated by conveyor-workflow.