(cherry picked from commit 491857b3c8)
491857b3c8
(cherry picked from commit d2563ee973) # Conflicts: # erpnext/patches.txt
d2563ee973