[keymap] make <play_pause> button actually trigger PlayPause action
Merge pull request #5244 from da-anda/keymap-overload

[UX] keymap fixes - don't overload pause action with something else
dvdplayer: fix setting playspeed on startup
Remove unused local variables
[gui] GUIFontTTF: allow loading fonts from any supported VFS, remove need for custom patch for freetype on win32
Revert "X11: avoid probing hw on query xrandr"

This reverts commit 5814e7f5696512c37c5f298467f71d10dfe3162d.
X11: recreate window after wakeup from dpms
Merge pull request #5288 from maksqwe/remove_unused

Cleanup unused local variables
Merge pull request #5202 from xbmc-imx6/pr-imx

ADD support for freescale i.MX6
Merge pull request #5189 from koying/chgdroidmusicpause

CHG: [droid] Do not pause music when going to background
fixed: Webdav directory listing was broken since 9c3495caf154e8dae9ec2bab6689cb97b135150b
[jsonrpc] add support for playing recordings by id
[jsonrpc] bump API version to 6.18.1
CGUIDialogProfileSettings: fix labels of choices available for "Media source" settings
CGUIDialogAudioSubtitleSettings: fix labels of choices available for "Audio stream" setting
silence warnings about implicit int64_t -> int conversion
Merge pull request #5310 from FernetMenta/X11

X11: fixes
Merge pull request #5308 from FernetMenta/player

dvdplayer fix setting playspeed on startup
[confluence] add audio/video flags

Added: hevc and vp9 video flags
Added: opus audio flag

refreshed webm logo hence the vp8 change.
Merge pull request #5313 from uNiversaI/icons2

[confluence] add audio/video flags