ID#219: fixed configuration file definition.
Merge branch 'release-2.1'