media: fix bug in server-side
Release 2.6.0
Merge branch 'master' into update/request
test: fix testing data
core: spaces instead of tabs. Coding tweaks