- Make chaining method call working again
Merge remote-tracking branch 'upstream/master'
- Cosmetics
- Drop unneeded headers