Fixed spelling in title.
Merge branch 'master' into gh-pages
Fixing merge conflicts.