Update master for new documentation standards#2784

Merged

weaverryan merged 1 commit intomasterfrom

version-catchup

Jun 29, 2013

Commits on Jun 29, 2013

[#2720] Playing "catch-up" to get the master branch up to date with the new documentation standards
weaverryan
committed