deriving-0.7
Merge pull request #2778 from hnrgrgr/deriving-0.7

deriving-0.7