Upstream version 20160303