I won't be maintaining this anymore...
This branch is now 1.2 bleeding