Merge origin/bootstrap3 and fix conflicts