Updating to official 25f from Jan 15, 2013