daily fix
Merge remote-tracking branch 'origin/hexes' into hexes