diff --git a/.gitignore b/.gitignore
index bdb84ea..4e7102a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@
 compile
 test-driver
 erl_crash.dump
+package-lock.json
 project.lock.json
 
 .sonar
@@ -116,6 +117,7 @@
 /lib/cpp/test/TFileTransportTest
 /lib/cpp/test/TInterruptTest
 /lib/cpp/test/TNonblockingServerTest
+/lib/cpp/test/TNonblockingSSLServerTest
 /lib/cpp/test/TPipedTransportTest
 /lib/cpp/test/TServerIntegrationTest
 /lib/cpp/test/TSocketInterruptTest
@@ -221,6 +223,7 @@
 /lib/java/build
 /lib/js/dist
 /lib/js/doc
+/lib/js/package-lock.json
 /lib/js/test/build
 /lib/netcore/**/.vs
 /lib/netcore/**/bin
@@ -265,6 +268,8 @@
 /lib/php/test/packages/
 /lib/py/dist/
 /lib/erl/logs/
+/lib/go/pkg
+/lib/go/src
 /lib/go/test/gopath/
 /lib/go/test/ThriftTest.thrift
 /lib/rs/target/
@@ -299,6 +304,7 @@
 /test/log/
 /test/test.log
 /test/erl/.generated
+/test/erl/.rebar
 /test/erl/ebin
 /test/go/bin/
 /test/go/ThriftTest.thrift
@@ -306,6 +312,7 @@
 /test/go/pkg/
 /test/go/src/code.google.com/
 /test/go/src/github.com/golang/
+/test/go/src/golang.org/
 /test/go/src/gen/
 /test/go/src/thrift
 /test/haxe/bin
diff --git a/build/docker/README.md b/build/docker/README.md
index 85cb3b2..57a190f 100644
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -3,8 +3,10 @@
 
 ### Available Containers
 
-* Ubuntu - based on ubuntu:trusty (14.04)
-* Centos - based on centos:6.6
+* centos - based on CentOS 7
+* centos6 - based on CentOS 6
+* ubuntu - based on Ubuntu Trusty (14.04 LTS)
+* ubuntu1604 - based on Ubuntu Xenial (16.04 LTS)
 
 ## Dependencies
 
diff --git a/build/docker/ubuntu1604/Dockerfile b/build/docker/ubuntu1604/Dockerfile
new file mode 100644
index 0000000..b6d81bd
--- /dev/null
+++ b/build/docker/ubuntu1604/Dockerfile
@@ -0,0 +1,240 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Apache Thrift Docker build environment for Ubuntu Xenial
+
+FROM buildpack-deps:xenial-scm
+MAINTAINER Apache Thrift <dev@thrift.apache.org>
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# Consider using mirror nearby when building locally
+# TODO: Provide option via --build-arg=...
+# RUN sed -i /etc/apt/sources.list -e 's!http://archive.ubuntu.com/ubuntu/!http://your/mirror/!g'
+
+#              _                              
+#   __ _ _ __ | |_   _ __ ___ _ __   ___  ___ 
+#  / _` | '_ \| __| | '__/ _ \ '_ \ / _ \/ __|
+# | (_| | |_) | |_  | | |  __/ |_) | (_) \__ \
+#  \__,_| .__/ \__| |_|  \___| .__/ \___/|___/
+#       |_|                  |_|              
+#
+
+RUN apt-get update && apt-get install -y --no-install-recommends apt apt-transport-https curl wget apt-utils
+
+# csharp
+RUN echo "deb http://download.mono-project.com/repo/debian xenial main" | tee /etc/apt/sources.list.d/mono.list && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A6A19B38D3D831EF
+
+# D
+RUN wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list && \
+    apt-get update && apt-get -y --allow-unauthenticated install --reinstall d-apt-keyring
+
+# Dart
+RUN curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
+    curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list && \
+    sed -i /etc/apt/sources.list.d/dart_stable.list -e 's/https:/http:/g'
+
+# dotnet (core)
+RUN curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/microsoft.gpg && \
+    echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main" > /etc/apt/sources.list.d/dotnetdev.list
+
+# OCaml - may not be necessary, skip for now
+#RUN echo 'deb http://ppa.launchpad.net/avsm/ppa/ubuntu xenial main' > /etc/apt/sources.list.d/avsm-official-ocaml.list && \
+#    gpg --keyserver keyserver.ubuntu.com --recv 61707B09 && \
+#    gpg --export --armor 61707B09 | apt-key add -
+
+# node.js (this step runs apt-get update internally)
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash
+
+# install general dependencies
+RUN apt-get install -y --no-install-recommends \
+`# General dependencies` \
+      bison \
+      build-essential \
+      clang \
+      cmake \
+      debhelper \
+      flex \
+      ninja-build \
+      pkg-config \
+      vim
+
+#  _                                               
+# | | __ _ _ __   __ _ _   _  __ _  __ _  ___  ___ 
+# | |/ _` | '_ \ / _` | | | |/ _` |/ _` |/ _ \/ __|
+# | | (_| | | | | (_| | |_| | (_| | (_| |  __/\__ \
+# |_|\__,_|_| |_|\__, |\__,_|\__,_|\__, |\___||___/
+#                |___/             |___/           
+
+RUN apt-get install -y --no-install-recommends \
+`# C++ dependencies` \
+      libboost-dev \
+      libboost-filesystem-dev \
+      libboost-program-options-dev \
+      libboost-system-dev \
+      libboost-test-dev \
+      libboost-thread-dev \
+      libevent-dev \
+      libssl-dev \
+      qt5-default \
+      qtbase5-dev \
+      qtbase5-dev-tools
+
+RUN apt-get install -y --no-install-recommends \
+`# csharp dependencies` \
+      mono-devel
+
+RUN apt-get install -y --no-install-recommends \
+`# D dependencies` \
+      dmd-bin \
+      libevent-dev \
+      libssl-dev \
+      xdg-utils
+RUN curl -sSL https://github.com/D-Programming-Deimos/openssl/archive/master.tar.gz| tar xz && \
+    curl -sSL https://github.com/D-Programming-Deimos/libevent/archive/master.tar.gz| tar xz && \
+    mkdir -p /usr/include/dmd/druntime/import/deimos /usr/include/dmd/druntime/import/C && \
+    mv libevent-master/deimos/* openssl-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
+    mv libevent-master/C/* openssl-master/C/* /usr/include/dmd/druntime/import/C/ && \
+    rm -rf libevent-master openssl-master
+
+RUN apt-get install -y --no-install-recommends \
+`# Dart dependencies` \
+      dart
+ENV PATH /usr/lib/dart/bin:$PATH
+
+RUN apt-get install -y --no-install-recommends \
+`# dotnet core dependencies` \
+      dotnet-sdk-2.0.0
+
+RUN apt-get install -y --no-install-recommends \
+`# Erlang dependencies` \
+      erlang-base \
+      erlang-eunit \
+      erlang-dev \
+      erlang-tools \
+      rebar
+
+RUN apt-get install -y --no-install-recommends \
+`# GlibC dependencies` \
+      libglib2.0-dev
+
+RUN apt-get install -y --no-install-recommends \
+`# golang (go) dependencies` \
+      golang-go
+
+RUN apt-get install -y --no-install-recommends \
+`# Haskell dependencies` \
+      ghc \
+      cabal-install
+
+RUN apt-get install -y --no-install-recommends \
+`# Haxe dependencies` \
+      haxe \
+      neko \
+      neko-dev \
+      libneko0
+RUN haxelib setup --always /usr/share/haxelib && \
+    haxelib install --always hxcpp
+
+RUN apt-get install -y --no-install-recommends \
+`# Java dependencies` \
+      ant \
+      ant-optional \
+      openjdk-8-jdk \
+      maven
+
+RUN apt-get install -y --no-install-recommends \
+`# Lua dependencies` \
+      lua5.3 \
+      lua5.3-dev
+
+# not in Xenial any more...
+#RUN apt-get install -y --no-install-recommends \
+#`# MinGW dependencies` \
+#      mingw32 \
+#      mingw32-binutils \
+#      mingw32-runtime \
+#      nsis
+
+RUN apt-get install -y --no-install-recommends \
+`# Node.js dependencies` \
+      nodejs
+
+RUN apt-get install -y --no-install-recommends \
+`# OCaml dependencies` \
+    ocaml \
+    opam
+RUN opam init --yes
+RUN opam install --yes oasis
+
+RUN apt-get install -y --no-install-recommends \
+`# Perl dependencies` \
+      libbit-vector-perl \
+      libclass-accessor-class-perl \
+      libcrypt-ssleay-perl \
+      libio-socket-ssl-perl \
+      libnet-ssleay-perl
+
+RUN apt-get install -y --no-install-recommends \
+`# Php dependencies` \
+      php7.0 \
+      php7.0-cli \
+      php7.0-dev \
+      php-pear \
+      re2c \
+      phpunit
+
+RUN apt-get install -y --no-install-recommends \
+`# Python dependencies` \
+      python-all \
+      python-all-dbg \
+      python-all-dev \
+      python-backports.ssl-match-hostname \
+      python-ipaddress \
+      python-pip \
+      python-setuptools \
+      python-tornado \
+      python-twisted \
+      python-zope.interface \
+      python3-all \
+      python3-all-dbg \
+      python3-all-dev \
+      python3-pip \
+      python3-setuptools \
+      python3-tornado
+
+RUN apt-get install -y --no-install-recommends \
+`# Ruby dependencies` \
+      ruby \
+      ruby-dev \
+      ruby-bundler
+RUN gem install bundler --no-ri --no-rdoc
+
+RUN apt-get install -y --no-install-recommends \
+`# Rust dependencies` \
+      cargo \
+      rustc
+
+RUN apt-get dist-upgrade -y
+
+RUN apt-get install -y --no-install-recommends \
+`# Clean up` \
+    && rm -rf /var/cache/apt/* && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /tmp/* && \
+    rm -rf /var/tmp/*
+
+ENV THRIFT_ROOT /thrift
+RUN mkdir -p $THRIFT_ROOT/src
+COPY Dockerfile $THRIFT_ROOT/
+WORKDIR $THRIFT_ROOT/src