Please update your master with 13w43 fixes

This release contains various fixes , update your working tree with the latest changes