Upstream version 20170509