Merge changes submitted by Matt Gagne <matt.gagne@state.vt.us>