Merge branch 'error_handler' of https://bitbucket.org/designst/mako/overview into t