Revert "Merge branch 'topic'"

This reverts commit 18ad64e2afe1d571506f5d890c2f10dce7a7be70, reversing
changes made to b9eb97ea3c2952ddc6cf05af20707fd11505c2a1.
2nd commit to topic
2nd commit to master
Revert "Revert "Merge branch 'topic'""

This reverts commit 762c9f1c109c1d2ce611d263df9127b94bb363b1.
Merge branch 'topic'

Conflicts:
	README