Pull request for issue #1025

Fixes #1025. Generated by conveyor-workflow.