merge in latest gradle samples