Merge master into this branch. Bring structure up to data to be compatible with jsbuild