Merge master into MC1.6