Be compatible with previous configuration format.
Bump version to 2.1.1
Merge branch 'release/v2.1.1' into develop

* release/v2.1.1:
  Bump version to 2.1.1