Update asm master with upstream master