Test that shows how Rewrite currently handles inheritance
Merge remote-tracking branch 'upstream/master'