refs #7268. Fix non-universal typedef.
Merge branch 'feature/7268_add_adaptive' into develop