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