Avoid extra redirect
Merge branch 'master' into bootstrap3
v1.1 bs3 support