updating from sf-docs 10/11/12
Merge pull request #199 from gregquat/2.1

updating from sf-docs 10/11/12
Merge remote-tracking branch 'upstream21/2.1' into 2.1