Fixed Typos
Merge branch 'release/1.5' into gh-pages