Merged in thorade/mako-2/thorade/unicoderst-edited-online-with-bitbucket--1420641728556 (pull request #15)

unicode.rst edited online with Bitbucket,