Merge remote-tracking branch 'upstream/master' into wip/statsd
Merge branch 'wip/statsd' of github.com:janm399/activator into wip/statsd