Upstream version 1.3.1