Merge branch '161_drop_bundled_slang'