(Release 5.0.0) Bump version
Merge branch 'master' into bootstrap3