Merge pull request #1 from NiLuJe/master

Fix legacy json import/export
Merge remote-tracking branch 'upstream/master'