Ordered changelo
Little deletion
Merge branch 'master' into debian
Better indentation