Merging latest enketo-express changes.

Merging latest enketo-express changes.