Patches
Plain Diff
Also added support for several attributes in columns and mainAttr and nameAttr special values. issue #5135