Using the latest unstable version
Merge branch 'develop'