Ugly, ugly hack to resolve errors due to data format change.
Now prioritizes local.ini over development.ini.
Merge remote-tracking branch 'upstream/master' into travis