- merge of 2.1.2 release being now the current released version in master. Conflicts: CMakeLists.txt NEWS test/bug.1104.t test/run_all
- merge of 2.1.2 release being now the current released version in master. Conflicts: CMakeLists.txt NEWS test/bug.1104.t test/run_all