Pull request for issue #544

Fixes #544. Generated by conveyor-workflow.