Rebase from 'release/indigo/geometry'
Placing debian template files