Merge docs fix from 2.1 maint