configuration file is optional
Merge branch 'master' into autosynced