Update master with latest fixes of 13w45

socioware-13w45