Merge "Update OOjs UI to v0.18.1"