Upstream version 20170519