Merge branch 'feature-list_defs' of https://bitbucket.org/jvanasco/mako into pr16