Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2
Merge branch 'openelec-3.2' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2
config/version: set version to 3.1.6

Signed-off-by: Stephan Raue <stephan@openelec.tv>