Merge a recent MOSES update and fix formatting