FIX: avoid waiting forever on a locked CPluginDirectory while exiting
FIX: Consistenly look for fonts in special//home, then special://xbmc
Python: Add a DelayedCallGuard to xbmc.executeJSONRPC.

Avoids locking other python threads running on the same process space as XBMC, since executeJSONRPC may trigger activity on them.
FIX: [stagefright] ignore frames with no valid pts
fix #3166: use URIUtils::AddFileToFolder
Settings: remove unused setting
[LangCodeExpander] Early return from methods if the string being looked up or converted is empty.
set focus to the first non-disabled control
disable spin controls with only one entry
FIX: Do not remove internet files from video db only because they come from a disappeared source
Remove duplicated includes
paplayer: fix flac 7 and 8 channels
FIX: [droid] Prevent droid from shutting us down when an usb/BT keyboard/gamepad is plugged in/out
ActiveAE: fix hang if stream provided data which was no multiple of framesize
ActiveAE: fix remap for channels greater 8
[GLES] speed up blending

(texture * color) costs us an extra operation on Mali when sent as varying.
Instead, since textures use the same color for the entire render, send it as
a uniform instead.

This does not apply to fonts, since the font and its shadow are rendered
together, and may not share a color (tested and looks bad).

This increases fps anywhere heavy blending is done.
[GLSL] cut diffuse+blend render time by 1/3

Mainly seen when we're fading in/out.

Mali likes this ordering better for some reason, ops go from 3 to 2 (according
to their profiler). Verified with PVR's compiler that there is no change, it's
2 there either way.
Fix British English spellings
dialogue      -> dialog    (when referring to GUI window items)
analogue      -> analog
color[s]      -> colour[s]
colorspace    -> colourspace
visualization -> visualisation
normalize     -> normalise
Harddisk      -> Hard disk (consistent with all other usage of "[Hh]ard disk")
disc          -> disk      (context: magnetic media)
disk          -> disc      (context: optical media)

'colourspace' -> 'colour space' nitpick
Merge pull request #3259 from FernetMenta/aefixes

Audio fixes
Merge pull request #3253 from t-nelson/pivos_settings_display_fixes

Pivos settings display fixes