typo fixes
Merge pull request #3052 from vlajos/typofixes20141102