Update to match upstream changes circa Jan2013.