Bumped version number
Merge branch 'master' into devel
Should have checked the htmls