Dev

merging new mc-1.4 patches into dev.

dev is reported to have no problems, merge into mainline soon?