Merge branch 'maint' to sync with GIT 1.5.2.2