fix redundant getndof
Merge branch 'master' into dev