Merge branch 'graticules'
cameras understood
Merge branch 'master' into dev