Merge pull request #3079 from ethomson/config Configuration changes for handling multiple of the same sections