Merge branch 'colons-in-args' overwriting recent changes as per Scott K. Clark.