Merge branch 'bump-bower-version'