Merge branch 'master' into cm-json-import-api
Merge branch 'cm-json-import-api' of https://github.com/cmelchior/realm-java into cm-json-import-api