Update debian branch

Update debian branch with latest commits from master branch ;)