Upstream version 20160312