Ignore files generated by code. Fix missing white space around substituted ex tags.
Merge remote-tracking branch 'origin/unstable' into unstable