gd: pull latest upstream changes (post RC2)