Fix the build
Increment version
Merge branch 'development'