Upstream version 20160603