Upstream merges

Jean <3