Update master making it possible to release again