Updated version number to match template bug fix.
Merge branch 'master' into dev
Merged master into dev