Added ES5 and JSON defs
auto-merge staging into master