Import changes from the google code omsp-working repository