Fixed typo
Merge branch 'master' into v20130628