Allow additional parts of the user agent to be set
Merge branch 'settable-user-agent' into develop

* settable-user-agent:
  Allow additional parts of the user agent to be set