Merge branch '16-t-varop-mm' into 21-debug
R_BIT_BUCKET just a simple define in vars.mk, since conditional define is only gmake
Merge branch '21-debug' into 22