Merge pull request #1160 from jkczyz/2011-11-spontaneous-invoice-payer