Upstream version 20160318