patches and extra sources have all been merged upstream