Proposed patch for v32
Merge pull request #2 from dolohow/unstable

Proposed patch for v32
Merge remote-tracking branch 'origin/unstable'