Back to debian stable, fix indent/comments after merge