Merge changes from master to debian

Merge commit 85b4c7f805f194c6f1bda25ef6ad725f8e6fea26 to debian