Merge "Compatibility with Debian and Ubuntu 16.04"