Merge changes from branch bareos into master;