Created by: nodh
Should be merged after releasing 3.7.0 since this change touches everything
Fixes #73