Modifying documentation for 2.x.1 release.
Merge branch 'feature-documentation'