apply 20130319.patch by Sergey Alyoshin