partial progress
Merge remote-tracking branch 'origin/docs_work_20131024'