Fixed configuration file.
Merge commit '14924db1f75b17756610eceb78d6e63ac921e0f0'