Merge branches 'release' and 'autoload' into release