Save the state of codemirror
Merge branch 'next' of github.com:rethinkdb/rethinkdb into michel_2460_current_query
Add try/catch for JSON.parse