Remove Break/Replaces.
Merge branch 'master' into wheezy