Merge branch 'master' into 3.2/master
Fix composer autoload
Fix tmp dir path
Merge branch '3.2/master'