Upstream version 20170214