oh god how was this overlooked for so long
Merge branch '1.6'