Bump to 2.1 alpha dev.
Fix typo of "parameter"

Fix typo: "parameter" vs. "paramater".

Reviewed at https://reviews.reviewboard.org/r/5994/
Merge branch 'release-2.0.x'