Bump master to 2.4