Upstream version 20170207