Private fork!

WARNING: This branch is likely to be rebased/reset backwardated
often.
Merge branches 'inline-choice-widgets', 'dateparts-extraneous-div', 'typeahead-datasets' and 'file-upload' into private