Fix another typo. Yay.
Merging dev into master for release.

Merge branch 'dev'