Master requires >= 3.1