Upstream version 20170205