Merge branch 'merged' into command-line-magic