Merged upstream/master

Just merged latest upstream/master and resolved two conflicts. Does this work or do we want to rebase instead?