Merge "I accidentally broken passion encoding while working around problems with the sholes encoder." into kraken