Pull request for issue #278

Fixes #278. Generated by conveyor-workflow.