Update to upstream version 0.3.17