Fixes #26 deprecated measurement_class_* template