Upstream version 20160719