Upgrade. Fixes #12