Merge branch 'features/2013-full'
Fixed a spelling mistake
Merge branch 'master' into gh-pages