Merge branch 'bbalentine' into badams
Merge branch 'badams' into bbalentine