Merge branch 'v2.0.1-dev' into v2.1-dev

* v2.0.1-dev:
  fix for bug 3640075
  fix importing bug (models where wrongly recognized as being corrupt)
  version 31
  add icon svg
  change icons back to blue
  fixed catalan localization