Merge branch 'master' of bitbucket.org:zzzeek/mako into w_json_metadata