Updated for upstream version 0.8.21