Remove COMPOSE, FMASK and COMPOSE-RR. (Old unpushed change.)
Merge remote-tracking branch 'origin/master'