Merge branches

Merge master into debian