Merge branch 'bootstrap' into current_master