Merge branch 'master' into metrics

# Conflicts:
#	elsa/core/CMakeLists.txt
#	elsa/core/Utilities/Statistics.hpp
#	elsa/core/tests/CMakeLists.txt
14 jobs for metrics in 14 minutes and 12 seconds (queued for 3 minutes and 28 seconds)