Add the month fix from 2.6
Merge branch '2.8'