Update branch against master with fixes.