Pull request for issue #298

Fixes #298. Generated by conveyor-workflow.