Emoncms V9.9.6 Stable merge (pre-merge check)

[borpin (Brian Orpin)]

@borpin

Just did a pull on master and found the Server information when posted here is not formatted correctly.

@TrystanLea Just created a PR to fix this.