Fixes issue #414
Merge branch 'master' into helios