Bug 882656 - Restoring topup functionality
Merge pull request #10434 from lodr/bug-882656-topup

Bug 882656 - Restoring topup functionality
r=arcturus