Pull request for issue #696

Fixes #696. Generated by conveyor-workflow.