Merge commit 'phobos/vidalia-bundle-updates-maint-0.2.1' into maint-0.2.1