Some dirty debug hack - look away.
Merge branch 'master' into noPairWise