Upstream version 20170303