Merge branch 'maint' to sync with GIT 1.6.0.6