fix for dagmciface problem
Merge pull request #321 from makeclean/jrcary_fix

fix for dagmciface problem
Merge branch 'upstream-develop' into develop

Syncing with upstream.