Merge upstream

Contains various fixes for R16 (currently erlang-syslog hangs in R16)