Merging in from the de-facto head maintained by sbercsiro right now.

Appears to include:

Dojo support
Encoding fixes
Check for lack of local storage
Quota exceeded kind of fix