Merged in thorade/mako-1/thorade/defsrst-edited-online-with-bitbucket-rel-1420641569769 (pull request #14)

defs.rst edited online with Bitbucket,