Fixes issue #106
Merge branch '4.0'