Backported fixes.  0.12.1 version bump