[sr-dev] git:master:d23aeb40: Merge pull request #784 from tverlaan/add_xenial_support