Interesting changes.
Merge branch 'sthg-slightly-more-interesting'