updating master with 13w43 fixes