v1.86 update.
Merge remote-tracking branch 'origin/MC-1.5+' into MC-1.5+