Upstream version 20160619