Upstream version 20160504