Merge master into debian to simplify future merges