Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings
Merge branch 'openelec-settings' of github.com:OpenELEC/OpenELEC.tv into openelec-settings