tarcieri Merge pull request #150 from tendermint/v0.11.3 …