Update to upstream release 0.13.1