Merge remote-tracking branch 'origin/development'
# Conflicts:
# library.properties
# support/Release notes.txt
# test/codeblocks/ETL.layout
# test/test_flat_map.cpp
# test/test_flat_multimap.cpp
# test/test_flat_multiset.cpp
# test/test_flat_set.cpp
