Merge master into MC1.6

Do this to reference correct for later merge.