Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken * commit 'f1f00f5bddd6b222879166f4528055a30bed307e': Missed these ones in the previous rename.
Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken * commit 'f1f00f5bddd6b222879166f4528055a30bed307e': Missed these ones in the previous rename.