Merge pull request #820 from timhobbs/upstream-master

Fix for key capture
Fix for media player thumbs