Update kstreet copy with master from Cheesebaron