Improved handling of default column parameters (no parens)
Merge remote-tracking branch 'origin/master'