Upstream version 20161204a