Upstream version 2016012