Updated for release 0.90.13.2