Update DeFRaG to latest upstream