etl

811393c0 - Merge remote-tracking branch 'origin/development'

Merge remote-tracking branch 'origin/development' # Conflicts: # src/container.h # src/map.h # src/multimap.h # src/multiset.h # src/stack.h # test/codeblocks/ETL.layout # test/test_flat_set.cpp # test/test_vector_non_trivial.cpp