Pull request for issue #720

Fixes #720. Generated by conveyor-workflow.