Commit to current development.

This version has been tested thoroughly and should be working as
expected.