Merge branches 'todo-output' and 'allow-non-js-wildcards' into production