AUtoload config
Merge branch '2.0.0-1.7.2DEV' into 2.0.0-1.7.10DEV