(Release 5.0.0) Bump version
Merge remote-tracking branch 'origin/master' into bootstrap3