aiden
/
iptv
mirror of https://github.com/iptv-org/iptv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,937 Commits
7 Branches
0 Tags
577 MiB
Commit Graph

2302 Commits (d94d3b49ba64c9e3985bf40bd5c5b9027f36b5bb)

Author SHA1 Message Date
Diego 83664ff605
Update do.m3u
Diego 05df6cb0a3
Update do.m3u
Diego 994f60b555
Update do.m3u
Diego 8c35298f68
Update do.m3u
Diego 24df645e6e
Update do.m3u
Diego ba96aea87b
Update do.m3u
Diego d185bbebbb
Update do.m3u
Diego bf0c3e769e
Update py.m3u 
Deleted steams for
Diego fcbf30e549
Merge branch 'master' into patch-2
Diego 65683ef6e1
Merge branch 'master' into honduras-patch
Diego 8817a1b825
Merge branch 'master' into chile-patch
Diego 6cf4e45249
Update cl.m3u
Aleksandr Statciuk ed01d14e00
Merge branch 'master' into patch-16
Aleksandr Statciuk 4626a9ab1b
Merge branch 'master' into LaneSh4d0w-patch-4
iptv-bot[bot] 5206cec24b
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
iptv-bot[bot] e6cf7256cb
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Diego 9ed857e504
Update cl.m3u
Diego 6a193adcc0
Merge branch 'master' into chile-patch
Diego 0c7678fe44
Update co.m3u
Diego ee493538b8
Merge branch 'master' into colombia-patch
Diego 11598a0123
Merge branch 'master' into paraguay-patch
Diego d902e0729c
Update py.m3u
UltraHDR f9001729fd
Fix Fadak TV
UltraHDR 77478f1978
Merge branch 'master' into patch-16
UltraHDR 1058b803f3
Add https://www.aloula.sa mirrors
UltraHDR 4a8ee53f13
Fix StockCharts TV
iptv-bot[bot] 2fda740b65
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
UltraHDR 12648c38ba
Merge branch 'master' into patch-16
UltraHDR 0ebd0f7a97
Merge branch 'master' into patch-15
Diego b596375b30
Update cr.m3u
Diego 87fe2fb0dc
Update hn.m3u
Diego f09bef3f42
Update py.m3u
Diego a050ccea20
Update py.m3u
Diego 412764e239
Update bo.m3u
iptv-bot[bot] 7b19491836
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Diego c2e4379b44
Update ec.m3u
Diego 36cc5ed8dc
Update cl.m3u
Diego c1aa9b3706
Update cl.m3u
Diego a509fb91ec
Update cl.m3u
Diego 5a5b100135
Update co.m3u
UltraHDR d66dd2c2db
Update uk.m3u
UltraHDR b0573b900c
Merge branch 'master' into patch-16
Diego 1883942f38
Update co.m3u
LaneSh4d0w 03a72fc5ec
Merge branch 'master' into arg-patch
LaneSh4d0w 59e8cce4f7
Update ar.m3u
Diego 360d51670f
Update ar.m3u
Diego c6c5d475da
Merge branch 'master' into arg-patch
Diego edccdf55da
Update ar.m3u 
Added other streams
Diego 00999e2c8b
Merge branch 'master' into cna-patch
iptv-bot[bot] 8b610630e3
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 09f105db23
Merge branch 'master' into cna-patch
UltraHDR e7b034660c
Merge branch 'master' into patch-16
iptv-bot[bot] 3e0be406f0
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Diego 1cd309a365
Update ar.m3u
Diego 3dee6f33a6
Update ar.m3u
Diego cecea2fc26
Update ar.m3u
Diego 0ce5432311
Update ar.m3u
Diego 76e044600f
Update ar.m3u
Diego 9be5d70a24
Update ar.m3u
Diego 83ae9c8a8d
Update ar.m3u
Diego 7a0f8d8f43
Update ar.m3u
Diego 928314c8f2
Update ar.m3u
Diego e09be75903
Update ar.m3u
Diego cbafe515f8
Update ar.m3u
Diego f0943ecec8
Update ar.m3u
Diego edd30a7c6f
Update ar.m3u
Diego f3756771c1
Update ar.m3u
Diego 2260d6160f
Update ar.m3u
Diego f7d57a9e41
Update ar.m3u
Diego 6f71ee88a1
Update ar.m3u
Diego e873d1b1ea
Update sg.m3u
Diego 025941b5c2
Update sg.m3u 
Set CNA local and international feed
LaneSh4d0w 3a372e2dc3
Update py.m3u
LaneSh4d0w db2bafbf1d
Merge branch 'master' into patch-17
LaneSh4d0w 6711559d12
Merge branch 'master' into patch-17
LaneSh4d0w b9ce169038
Merge branch 'master' into LaneSh4d0w-patch-4
LaneSh4d0w 76e0206ba5
Merge branch 'master' into patch-18
iptv-bot[bot] ca7a6d564e
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w f21140d8d7
Merge branch 'master' into LaneSh4d0w-patch-4
UltraHDR fa43173449
Merge branch 'master' into patch-16
UltraHDR 5effd56f16
Merge branch 'master' into patch-17
UltraHDR af2e562c7c
Merge branch 'master' into patch-18
iptv-bot[bot] eede6a178b
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
fabiandv e8e9c3fe7a
Update py.m3u 
update links 
RCC TV, Unicanal, MiTV, Uniradio, Estacion Cristal
Aleksandr Statciuk 1d5a5fdc2e
Merge branch 'master' into LaneSh4d0w-patch-2
LaneSh4d0w 4e39bd790d
Merge branch 'master' into patch-4
UltraHDR 2e4c87dec4
Add CNBC Arabia mirror
UltraHDR 1fd98f934f
Update mr.m3u
UltraHDR a0b2fdb31b
Create mr.m3u
UltraHDR 2d7027c772
Update sa.m3u
UltraHDR 358cf71baf
Update kw.m3u
UltraHDR e75e6d0fe3
Update KurdMax Music
LaneSh4d0w 338c21af16
Merge branch 'master' into patch-4
LaneSh4d0w 744dfe7a13
Merge branch 'master' into LaneSh4d0w-patch-3
LaneSh4d0w 9499b7791f
Merge branch 'master' into LaneSh4d0w-patch-3
LaneSh4d0w 0aad7e0602
LU : Remove Jasmin TV
VoXaN24 d675fb3d4b
Update the mistake between the webTV for the radio and actual RTL (TV Chanel)
LaneSh4d0w b8e77212c0
Merge branch 'master' into patch-15
LaneSh4d0w 03c0a86d8c
Merge branch 'master' into LaneSh4d0w-patch-2
iptv-bot[bot] 4463cc3c38
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
UltraHDR 1c86057b49
Update iq.m3u
iptv-bot[bot] 5f01542d1f
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w cd89fad213
Merge branch 'master' into patch-1
LaneSh4d0w 08f0c08356
Update streams/py.m3u
LaneSh4d0w 2d6e2d209e
Update streams/py.m3u
iptv-bot[bot] df10c97d19
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
iptv-bot[bot] b94e58e038
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
iptv-bot[bot] 021f9994e0
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
iptv-bot[bot] 2a7ec11205
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
fabiandv 636f894032
Merge branch 'master' into patch-1
iptv-bot[bot] 5cd4ee8be3
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 97e6e1ce42
Update mv.m3u
LaneSh4d0w 8eb67b377e
My bad.
fabiandv e06d894e00
Update py.m3u 
uptdate c9n (480), SNT
iptv-bot[bot] 2dd34b0083
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w fb691b748e
Update mw.m3u
LaneSh4d0w 61748afb34
JP : maintenance
Allan Fernando 831b7eb057
Update kr.m3u
Allan Fernando 1ed012c97c
Update hk.m3u
iptv-bot[bot] 179ccb861d
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Aleksandr Statciuk 85ac772e4a
Merge branch 'master' into LaneSh4d0w-patch-2
iptv-bot[bot] 34ad888748
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 75c3d3c5eb
VN_FPTPLAY : Add Thailand Vinh Long TV channels
LaneSh4d0w 8a3a07010c
Merge branch 'master' into Kr_7.23.22
iptv-bot[bot] d71a19a57c
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Alsturit 5f8a67e80c Update Kr.m3u
Alstruit 07ab452898
Merge branch 'iptv-org:master' into Kr_7.23.22
Alsturit 7234d55637
Update Kr.m3u
iptv-bot[bot] 6b8c41ae99
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
iptv-bot[bot] cef7eb097d
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 372f10b6a3
Merge branch 'master' into allanf181-patch1
iptv-bot[bot] 36f453cf30
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Allan Fernando ef96808f11
Merge branch 'allanf181-patch1' into allanf181-patch1
Allan Fernando dfcc990b9d Add Korean channels
Allan Fernando c5139f6cf9 Add Korean channels
Allan Fernando 44fb654fc3 Add Korean channels
Allan Fernando b184589966 Add Korean channels
iptv-bot[bot] 51809e6084
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w a31a0f18bc
Merge branch 'master' into US_7.20.22
LaneSh4d0w c9a840a947
Merge branch 'master' into Kr_7.20.22
iptv-bot[bot] 2c247ee138
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Alsturit 19b9fcd96a
Update and fix kr.m3u
Alstruit 9e764d076c
Merge branch 'iptv-org:master' into US_7.20.22
Alsturit ea1c3cf270
Update us.m3u
iptv-bot[bot] 49a9d80bbf
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Aleksandr Statciuk a11f4329c6 Merge branch 'master' into pr/7771
Aleksandr Statciuk 86aa82da6b
Merge branch 'master' into Kr_7.16.22
Diego 888f4b6382
Update pe.m3u
Diego e3b3350699
Update pe.m3u
iptv-bot[bot] 12de58e944
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Alsturit 44516974ca Revert "Tvg-id fix" 
This reverts commit 55756c5320.
Alsturit 26e8b90458
Revert to 55756c5
Alstruit f1cad91f95
Merge branch 'master' into Kr_7.16.22
Alsturit 118bf80e2b Merge remote-tracking branch 'origin/master' into Kr_7.17.22
iptv-bot[bot] 84833f646a
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Alsturit 55756c5320
Tvg-id fix
Alsturit d688c32a36
Update
LaneSh4d0w 6d0518ecf0
Merge branch 'master' into Kr_7.17.22
Alstruit b234112e4d
Merge branch 'master' into Kr_7.16.22
iptv-bot[bot] dee6409cc8
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Alstruit a4b714e6cb
Merge branch 'iptv-org:master' into Kr_7.16.22
Alstruit 6d1a4b4263
Merge branch 'master' into Kr_7.17.22
Alsturit 63f2d73a1e
Update and fix tvg-id
LaneSh4d0w c2dd4addd4
Merge branch 'master' into patch-15
LaneSh4d0w 06fdc92f3d
Merge branch 'master' into Kr_7.16.22
iptv-bot[bot] e5e32f3c5f
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Alstruit 842e81e711
Merge branch 'master' into Kr_7.16.22
Alsturit cfd3ea8daa
Resolve conflict
Alsturit f99095c42a
Add tvg-id and reorder
Alsturit 745b1e4630
Add tvg-id and reorder
Alstruit fd208360b4
Merge branch 'master' into Kr_7.17.22
iptv-bot[bot] 47df14c452
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Alsturit 64175a1b37
Resolve conflict
Alstruit 36b04d381c
Merge branch 'master' into Kr_7.17.22
Alsturit 0d1aee5379
Resolve conflict
iptv-bot[bot] 0a00f994b8
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Alsturit 161e8861e2
Add MBC to kr.m3u
Alsturit a34c088783
Update to latest change to kr.m3u
UltraHDR a62ceb7ef1
Add Al Jazeera mirrors
Alsturit 5532d55f25
Fix: SBS Links and push error
LaneSh4d0w 6eb2c8b437
Merge branch 'master' into LaneSh4d0w-patch-3
Aleksandr Statciuk 5c350543db
Merge branch 'master' into patch-15
iptv-bot[bot] f1cf26493c
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Manipulativemachan 1f7fbf9752
Added few channels and updated a link
LaneSh4d0w ef239cd438
Merge branch 'master' into LaneSh4d0w-patch-3
LaneSh4d0w 7c5d9181ba
Update kr.m3u
iptv-bot[bot] 5ab25d39a6
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 6d0643c01b
Merge branch 'master' into patch-2
Aleksandr Statciuk df2e486c08
Merge branch 'master' into mx-patch
Aleksandr Statciuk 9075746eaf
Merge branch 'master' into LaneSh4d0w-patch-3-1
LaneSh4d0w febd0ea1e6
Merge branch 'master' into patch-2
LaneSh4d0w 5d6f398b75
Merge branch 'master' into mx-patch
LaneSh4d0w 2e14562bd6
Merge branch 'master' into LaneSh4d0w-patch-3-1
UltraHDR 22da43b3c2
Merge branch 'master' into patch-14
UltraHDR d07f913724
Merge branch 'master' into patch-2
Aleksandr Statciuk e6fe488ef6
Merge branch 'master' into LaneSh4d0w-patch-4
LaneSh4d0w 3b74e515ea
Merge branch 'master' into mx-patch
LaneSh4d0w d25e263088
Merge branch 'master' into peru-patch
UltraHDR d19fcad993
Update qa.m3u
iptv-bot[bot] 349b4c6b84
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Aleksandr Statciuk b6db91e4ac
Merge branch 'master' into LaneSh4d0w-patch-2
Aleksandr Statciuk 4f7c28e39e
Merge branch 'master' into LaneSh4d0w-patch-4
Aleksandr Statciuk 03432a3e38
Merge branch 'master' into peru-patch
Aleksandr Statciuk b1c785abdb
Merge branch 'master' into LaneSh4d0w-patch-2
UltraHDR aa64500135
Merge branch 'master' into patch-1
iptv-bot[bot] ead160249a
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Diego 85b2ae2087
Update pe.m3u
UltraHDR e4aff05871
Update il.m3u
UltraHDR 74ae6f4ffd
Update il.m3u
UltraHDR 1669f62bd3
Add I24 News Arabic
LaneSh4d0w 203b26cc81
Update vn_fptplay.m3u
LaneSh4d0w 99ddabf173
Update jp.m3u
LaneSh4d0w fd93069d95
CO : maintenance
iptv-bot[bot] 451a39e74d
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 11fc4acf37
Merge branch 'master' into peru-patch
LaneSh4d0w d0cbb80ae8
Merge branch 'master' into LaneSh4d0w-patch-2
Aleksandr Statciuk f61949e36f
Merge branch 'master' into retromagico-patch
UltraHDR b859be5d41
Merge branch 'master' into patch-2
iptv-bot[bot] 39b1977424
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w dbb6ed3e5c
Rename bq.m3u8 to bq.m3u
iptv-bot[bot] 24ca2bab83
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Diego cf16ea36a9
Update ar.m3u
Diego 3cd0b0836a
Update mx.m3u
Diego 9456928a65
Merge branch 'master' into peru-patch
Diego 5bd1621f23
Update pe.m3u 
Add ChinchaTV
iptv-bot[bot] 8c173da3db
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
iptv-bot[bot] c8925b0a42
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
Diego 4186996db3
Update pe.m3u
Diego e8989d5055
Update pe.m3u
UltraHDR 36a2d94b50
Merge branch 'master' into patch-2
LaneSh4d0w bc3f84c780
Merge branch 'master' into patch-1
UltraHDR 0e59212ece
Merge branch 'master' into patch-12
Aleksandr Statciuk c2a0b73548
Merge branch 'master' into patch-12
Aleksandr Statciuk 5b7375513e
Merge branch 'master' into patch-13
iptv-bot[bot] bf81a0dac3
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
LaneSh4d0w 3f74e68dff
Merge branch 'master' into patch-1
LaneSh4d0w a685a11b64
Merge branch 'master' into patch-12
LaneSh4d0w 79b9e7ef9b
Merge branch 'master' into patch-13
UltraHDR acdc11d6de
Merge branch 'master' into patch-6
UltraHDR 76a423ebb3
Merge branch 'master' into patch-12
UltraHDR 16b3ddab5c
Merge branch 'master' into patch-13
LaneSh4d0w c0971f1cee
Update cw.m3u
iptv-bot[bot] 4f1c383faf
[Bot] Daily update () 
* [Bot] Update /streams

* [Bot] Update README.md

Co-authored-by: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
UltraHDR dbdf2a90df
Update ly.m3u
UltraHDR 77f7ca788c
Update om.m3u
UltraHDR 71dcdc1da3
Update ps.m3u
UltraHDR 08d0285cab
Merge branch 'master' into patch-1
UltraHDR 5b60378c95
Merge branch 'master' into patch-1
UltraHDR 05484fca0b
Merge branch 'master' into patch-6
UltraHDR 569b18ba3d
Merge branch 'master' into patch-2