everything non 'pedia to 1.21wmf9

Change-Id: I3b69ff8d991f45a07f204d4f7af1c329663bb78b