Fixes #120

Changed filename so that autoloading works on case-sensitive filesystems
Merge branch '4.0' into 4.1
Merge branch '4.0' into 4.2
Merge branch '4.1' into 4.2
Merge branch '4.2'