Update to upstream 0.2.31, SVN r223