fixed typo
Merge branch 'master' into merge_pd_0_44