Updated to upstream version 0.8.18