Merge pull request #1 from bareos/master