Merge branch 'master' into 1.3.0
zomg massive directory changes to get some autoloading goodness
Merge branch 'v1.3.0'