Merge from upstream
Merge from origin
Merge from origin
Merge from upstream
Merge from upstream
site language was left out of siteinfo
Rebase from upstream
Merge from master
query for statistics are now executed by poller
Merge pull request #610 from tuscanhobbit/dev

site language wasn't included in siteinfo/json