Pull request for issue #336

Fixes #336. Generated by conveyor-workflow.