Update to 0.9.2.5.
Merge branch 'unmodified'