Pull request for issue #636

Fixes #636. Generated by conveyor-workflow.