Merge in latest upstream additions