Update to 1.1 (with some extra funny upstream objects).
