Drafts fixup #833

Merged
merged 16 commits into from Mar 4, 2013