tagoh pushed to gyp (f22). "Rebase to 0bb6747. (..more)"