Pull request for issue #424

Fixes #424. Generated by conveyor-workflow.