Added ES5 JSON defs
Added RFC JSON defs
auto-merge staging into master