Merge pull request #5029 from practicalswift/typo-fixes-20160927