Merge disorder.macros branch.