Sync with 1_3_16_branch. Fix bug 128.