Order incompatible with controls/cases
Merge branch 'master' into RcppBootstrap