Updates from wm1(2) 140519