Merge branch 'master' into extract
Merge branch 'extract'
Merge branch 'master' into opat
Indicate that external length is CM.

refs #221