Merge "Update OOjs to v1.1.7"