Update 1.6 Branch to master

So 1.6 branch can reference master and merge later