rewriting typedef to not use typename
Merge branch 'master' into cdf_tests