Upstream version 20170309