oops.. yes merged the 2-1-stable upstream.