Merge branch 'master' into metrics
# Conflicts: # elsa/core/CMakeLists.txt # elsa/core/Utilities/Statistics.hpp # elsa/core/tests/CMakeLists.txt
# Conflicts: # elsa/core/CMakeLists.txt # elsa/core/Utilities/Statistics.hpp # elsa/core/tests/CMakeLists.txt