etl

a7880f77 - Merge remote-tracking branch 'origin/development'

Merge remote-tracking branch 'origin/development' # Conflicts: # test/codeblocks/ETL.layout # test/test_flat_set.cpp # test/vs2017/etl.vcxproj.filters