Repacking Brian's changes from DEV.

Signed-off-by: Joe Whitsitt <joe-whitsitt@uiowa.edu>