Updating to 1.6
Merging some 1.5 fixes