Pull request for issue #672

Fixes #672. Generated by conveyor-workflow.