Updated version, it is stable enough!
Merge branch 'refs/heads/3.2/master' into 3.2/develop