Upstream version 20170202