Fork from google code 1.1-rc2, by Plausible Labs