apply 20130325.patch by Sergey Alyoshin