Bumps version to ship EwenG's fix.
Merges with upstream
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'