Last origin master before big merge with origin master does not work with Astrosmurfs(tm) without multiple fixes.