Merge master into work-in-progress command-line options branch