Fix to Software.sandia.gov repo to get code to compile.
Merge branch 'gitmaster' into master-merge