HOTFIX: Forgot to update the VERSION file...
Merge branch 'master' into fannieDevelop