Pull request for issue #548

Fixes #548. Generated by conveyor-workflow.