Upstream version 3+2014010901