rollback this branch to match bsmaster3 from addyosmani