Take into accounts changes proposed in tezos (and release)

I think tezos/tezos!1298 (merged) and tezos/tezos!1300 (merged) have been taken into account. You need to decide what to do with tezos/tezos!1307 (closed) and release :-)