[chromium-freeworld/f28] (6 commits) ...fix branches