Merge pull request #54 from rowanthorpe/build-doc-typo

Fix small typo in doc generator
Merge branch 'update-l2database-fixes' into production
Merge branch 'typos-ip-addresse_s_' into production
Local production branch tweaks