Apply https://github.com/fastmonkeys/stellar/pull/31.patch