should we not better have master and 2.5 now that master has moved to 2.4?