Design Patterns
Merge commit 'a354041a94c04158cab6fef94956559992c564f9'