Ticket #1140: Update modules, part 1 (just updating code)
Ticket #1140: Update modules, part 2 (reapplying patches)