**Erroneously also contains 8ea43d93 since I forgot to reset to master when switching to a different branch. **