port in everything from 1.6 but labotimizetools(will do that later this weekend)
Merge branch 'squash'