Upstream version 20160712