Changed handling of local private configuration file
Merge remote-tracking branch 'origin/master'