pre-git version of 2011-12-17.