- Update to 2.2.4
- Update to 2.12.
Merge remote-tracking branch 'upstream/master'