Upstream version 20160419