Fix issue 319 @dagolden
Merge branch 'devel' into issue/319
Merge branch 'issue/319' into devel