Typo fix, choose -> chosen.
Merge pull request #1158 in master
Merge pull request #1148
Merge pull request #1148 in develop