Merge branch 'upstream'
initial upstream branch
Pruning old source
Imported Upstream version 3.5.2
Merge tag 'upstream/3.5.2'

Upstream version 3.5.2
Import debian directory from Bas