Merge branch 'master' into develop

Conflicts:
	README.md

README.md

@@ -6,7 +6,7 @@ Blockchains are a system for creating shared multi-master application state.
 **ABCI** is a socket protocol enabling a blockchain consensus engine, running in one process,
 to manage a blockchain application state, running in another.
 
-For more information on ABCI, motivations, and tutorials, please visit [our blog post](http://tendermint.com/blog/abci-the-tendermint-socket-protocol/).
+For more information on ABCI, motivations, and tutorials, please visit [our blog post](https://tendermint.com/blog/abci-the-tendermint-socket-protocol).
 
 Other implementations:
 * [cpp-abci](https://github.com/mdyring/cpp-abci) by Martin Dyring-Andersen