Merge Mary's command line post 

Merge away.