merge license, hostname buffer changes from master branch