Backed out changeset: ef949e6e6de1, which was itself a backout of the fix for Distribute #323, so this backout restores that fix and also Fixes #141.
Merge fix for #141
Bumped to 2.2 in preparation for next release.
Added tag 2.2b1 for changeset ab1c2a26e06f
Missed the last two words.