Merge branch 'maint' to sync with Git 1.7.3.3