Upstream stable release 2011-05-25a.