Upstream version 20160912