Pull request for issue #686

Fixes #686. Generated by conveyor-workflow.