Merge pull request #1 from bjlittle/master

Merge pull request #1 from cbcunc/master
Second volley from RENCI.
Merge pull request #2 from cbcunc/master

Second volley back from RENCI.