Spring cleaning!

Latest upstream from CM theme template