Merge pull request #1062 from galderz/t_payment_hash_999