Updated for upstream release 0.10.1