Merge Strangeness commit

Interesting.