Merge branch 'maint' to synchronize with 1.5.1.6