master
Moved JSON export code from JavaScript to C++ (#984)
Fixed bugs with wrong lang data being loaded per #834 and #835 (#836)