Merge branch 'pre-2.1'

* pre-2.1:
  Add support for #EXT-X-KEY
Merge branch 'no-time-mod-pre-2.1' into no-time-mod

* no-time-mod-pre-2.1:
  Simplify key fix
Merge branch 'no-time-mod'

* no-time-mod:
  Simplify key fix
Update hockey.luac

Change user-agent to match iPad media player user agent
Merge remote-tracking branch 'MikE41/patch-1' into pre-2.1

* MikE41/patch-1:
  Update hockey.luac