Upstream version 20160206