Commit Graph

7100 Commits (5f06e3ab6a62d7dc1cb85dc01e23b11a11713f41)

Author SHA1 Message Date
Aleksandr Statciuk 7c567620f2
Merge pull request from LaneSh4d0w/patch-4
GT : Add channels.
Aleksandr Statciuk c2efa7e708
Merge pull request from tilfizyawn/patch-35
Update France 24 resolutions
MapGuy11 d0dc7db017
Add KNBC-DT1 (1080p)
This stream is the full schedule of KNBC-DT1.
freearhey cf0b08af2c Update az.m3u
All streams from mfe.cliptv.az freeze a few seconds
Aleksandr Statciuk b40c01e031
Merge branch 'master' into patch-36
Aleksandr Statciuk 7d8ae26442
Merge pull request from iptv-org/bot/remove-broken-links
[Bot] Remove broken links
freearhey 171b0c3058 Update tr.m3u
freearhey 25d6cbd604 Update se.m3u
freearhey 1f6c120afe Update qa.m3u
freearhey c0a83fccd3 Update it.m3u
freearhey 1c690e7b59 Update in.m3u
freearhey a6e0c6ff07 Update il.m3u
freearhey 6f2d2db791 Update gr.m3u
freearhey 090f737981 Update es.m3u
freearhey 3426101f2a Update do.m3u
freearhey 37cd45e3d4 Update cl.m3u
freearhey 26243d1297 Update br.m3u
freearhey e123305acb Update bo.m3u
freearhey ffc1b38569 Update ba.m3u
freearhey 2c309a90dd Update at.m3u
freearhey 6f6d485509 Update dz.m3u
Shadix A e7f44e4149
NI : Add some channels.
freearhey 5683326e10 Merge branch 'master' of github.com:iptv-org/iptv
freearhey dd11f4f5ab Update sa.m3u
Resolve https://github.com/iptv-org/iptv/issues/2749#issuecomment-841745430
Aleksandr Statciuk 85d4a52493
Merge pull request from tilfizyawn/patch-30
Update uk.m3u
Aleksandr Statciuk 1336959d73
Merge pull request from heroku-miraheze/patch-10
US: Add Pluto TV Animakids Plus and fix iptv repository.
Aleksandr Statciuk 6d199b9918
Merge branch 'master' into patch-5
Aleksandr Statciuk 4ddb9a2f04
Merge pull request from tilfizyawn/patch-33
Update fr.m3u
Aleksandr Statciuk 4937676cbe
Merge pull request from LaneSh4d0w/patch-3
CH : Update Rouge TV (second version)
freearhey c01c243460 Update us.m3u
Added link from 
MapGuy11 e6874d4ec8
Add Fun Roads
Add Fun Roads Master feed only in 720p
MapGuy11 98c1201489
Add Some Locals
Dum4G 7fac8f5a8a
Update dz.m3u
More Echorouk for Echorouk enjoyers. In better quality
tilfizyawn f32c3e978e
Update uk.m3u
tilfizyawn e33f527d52
Add FashionTV variants
Brian Musundi 3f17f70cba
Update ke.m3u
freearhey 472496c87c [Bot] Update playlists
Shadix A 842df3d62f
GT : Add channels.
trancer1994 8a5973263f
Update az.m3u
trancer1994 43b64f99a6
Update ro.m3u
trancer1994 9b7d22b544
Update de.m3u
trancer1994 ee5bc2e427
Update tr.m3u
trancer1994 331727ae39
Update iq.m3u
trancer1994 5973ed06cf
Update ae.m3u
tilfizyawn 3531fc2b40
Update France 24 resolutions
trancer1994 9cdafcd98b
Update us.m3u
Brian Musundi edd0ef3d55
Update ke.m3u
Brian Musundi 7d5ba02328
link updates to KE.m3u
trancer1994 6028880001
Update lb.m3u
trancer1994 6910fce609
Update bo.m3u
trancer1994 f5a4583c4e
Update om.m3u
trancer1994 ebac3edb38
Update ae.m3u
trancer1994 afdc2ae775
Merge pull request from tilfizyawn/patch-29
Add Melody FM Jordan
heroku-miraheze 9963585f10
Create ni.m3u
heroku-miraheze 30a1d7e7aa
Delete Ni.m3u
heroku-miraheze 8dcf423c58
US: Add Pluto TV Animakids Plus
trancer1994 c8f4aeee55
Update fr.m3u
trancer1994 b22d5818e5
Update ir.m3u
trancer1994 fa28fb2b8b
Update af.m3u
trancer1994 39aa4f0d0d
Update ps.m3u
trancer1994 fcc126a4a1
Update fr.m3u
trancer1994 a6442b3c46
Update fr.m3u
trancer1994 ac2676fa28
Update pe.m3u
trancer1994 0ce358f3d4
Nicaraguan channels. Will try to find more.
trancer1994 195c697114
Update kr.m3u
trancer1994 acfd5d1411
Update jp.m3u
trancer1994 55e342ec24
Update cn.m3u
trancer1994 b814871ca3
Update qa.m3u
trancer1994 27bfbb3434
Update py.m3u
trancer1994 1dc9ad0b52
Update ua.m3u
trancer1994 b432064193
Update do.m3u
trancer1994 0e43156510
Update fr.m3u
trancer1994 6f67da3d45
Update ch.m3u
trancer1994 86af58d3e1
Update at.m3u
trancer1994 a7f5343088
Update it.m3u
trancer1994 7bcf4e01c7
Update pe.m3u
trancer1994 aa9a663253
Update pt.m3u
trancer1994 804229d591
Update om.m3u
trancer1994 88f9aeca54
Update us.m3u
trancer1994 c97803cea0
Update tr.m3u
trancer1994 de7edd480f
Update ba.m3u
trancer1994 bca87ca358
Update ma.m3u
trancer1994 454c78bfd4
Update uk.m3u
trancer1994 fb3ec2cdd3
Update tz.m3u
trancer1994 73f719edca
Update mz.m3u
trancer1994 c5c9e7c1c5
Update cl.m3u
trancer1994 cbca955f62
Update cl.m3u
trancer1994 67a5285e14
Update rs.m3u
trancer1994 ba9768f416
Update lv.m3u
trancer1994 850f90b7c2
Update cz.m3u
trancer1994 18f8fd6d19
Update sk.m3u
trancer1994 4fb6800dae
Update cl.m3u
trancer1994 3876f9cb22
Update pl.m3u
Shadix A 076b37bb60
Update us.m3u
Shadix A 2ddd8a1034
Update us.m3u
tilfizyawn 8a9b5e33d9
Update fr.m3u
Shadix A c27fed023e
US : Add The Beach Channel + World Fashion Channel
Many thanks to @tilfizyawn for submitting those.
Shadix A 7011a7ed62
Update ch.m3u
tilfizyawn 91dc6bfd40
Update uk.m3u
Shadix A edc5149357
Update ch.m3u
Shadix A 1f3a398923 Merge branch 'iptv-org:master' into patch-3
tilfizyawn a715b3bf3c
Update fr.m3u
tilfizyawn 6dc1d7ce67
Update uk.m3u
tilfizyawn 1d26dcee91
Update uk.m3u
tilfizyawn e46d71a63e
Add Melody FM Jordan
github-actions 14085a129a [Bot] Format playlists
Aleksandr Statciuk 829aec178f
Merge pull request from LaneSh4d0w/patch-4
FR : Delete RMC
freearhey d6847452b4 Merge branch 'master' into remove-broken-links
freearhey ba9ccea120 Merge branch 'remove-mfe.cliptv.az-links'
freearhey e7f5d23fe6 Update playlists
freearhey b445cbafba Update by.m3u
freearhey e9c83836d0 Update se.m3u
- removed broken links
- update channel description
freearhey 5e8341d451 Update ru.m3u
- removed links from mfe.cliptv.az (stream freezes after few seconds)
- removed Kvartal TV (CCTV)
- removed links from 51.195.44.53:8081 (not working)
- removed broken links
- updated channel descriptions
freearhey 4d23d72c2f Update ua.m3u
freearhey 844262e64b Update us.m3u
Shadix A ccf73c22d7
FR : Delete RMC
RMC = Radio Monte-Carlo, the "video stream" only shows an indication saying that it's live.

Not to confound with TMC, that is Télé Monte-Carlo, that is indeed a channel from the TF1 group.
Shadix A 6fefbb13a5
Update ch.m3u
Not only streaming movies, also some TV shows, moved to Entertainment
Shadix A 7fd1abbdd9
Update ch.m3u
Shadix A c338734bcc
CH : Update "Rouge TV"
Precising that this channel also streams adult content around 1 AM (UTC+2)
Brian Musundi db7dff3522
Update to ke.m3u
freearhey e89dd9b5d4 Update in.m3u
Removed broken link ()
github-actions 3d1fde7935 [Bot] Format playlists
Aleksandr Statciuk 47379f0701
Merge pull request from iptv-org/update-list-of-supported-categories
Update list of supported categories
freearhey 8d0ae30a96 Update playlists
freearhey 0b20209b6a Update us.m3u
Update channel description

freearhey 56e2d62662 Update ru.m3u
Removed broken links
freearhey 27c60cde2f Update sa.m3u
Resolve 
github-actions 988a723e9c [Bot] Format playlists
freearhey c7b80d6d27 Update sa.m3u
Removed broken links
Aleksandr Statciuk 603e7144bb
Merge pull request from tilfizyawn/patch-28
Update ae.m3u
Aleksandr Statciuk aa920ad2b5
Merge pull request from tilfizyawn/patch-27
Update ir.m3u
Aleksandr Statciuk 7f2b6377a0
Merge pull request from tilfizyawn/patch-26
Update eg.m3u
tilfizyawn b313761469
Update ae.m3u
tilfizyawn d8221433b0
Update ae.m3u
tilfizyawn 7b8e441229
Update ae.m3u
tilfizyawn fafe25f544
Update ir.m3u
tilfizyawn 63bba1b97b
Update eg.m3u
tilfizyawn 9837c93198
Add Rotana Radio Jordan
freearhey df79af95eb Update us.m3u
freearhey 68a8f650b7 Update ru.m3u
freearhey 47d18df0df Update pt.m3u
freearhey 4e835a062f Update pe.m3u
freearhey 126efb7828 Update it.m3u
freearhey 1dbf7305ed Update in.m3u
freearhey 2f2897590d Update es.m3u
freearhey b8344df363 Update br.m3u
freearhey 42cb378cbd [Bot] Update playlists
github-actions 639352fbe1 Merge branch 'master' of https://github.com/iptv-org/iptv
github-actions 69daa9dc52 [Bot] Format playlists
github-actions 4b79f95634 [Bot] Remove duplicates
trancer1994 0feb3ecf4e
Update uz.m3u
trancer1994 a66c146e45
Update kz.m3u
trancer1994 f1fe87998b
Update al.m3u
trancer1994 07c84683c3
Update eg.m3u
freearhey 632b43f276 Update playlists
Brian Musundi 59891a597e
Link updates to ke.m3u
github-actions 1e50685082 [Bot] Format playlists
github-actions 366075fa8b [Bot] Remove duplicates
Aleksandr Statciuk eaada5ff0f
Merge pull request from LaneSh4d0w/patch-3
JP : Changes
Shadix A 50a72b1026
Update jp.m3u
Shadix A cea2fcb406
JP : Reinstating some Animax links
Seems that some went working again.
Aleksandr Statciuk b7e321a3fd
Merge pull request from LaneSh4d0w/patch-2
AR : Changes
trancer1994 dab027c515
Update tm.m3u
trancer1994 6822bb0d4f
Update ca.m3u
freearhey 00b96a5b6b Update tr.m3u
freearhey 21216ef039 Update ph.m3u
freearhey 0483adab9c Update pe.m3u
freearhey 725bb2c2f7 Update lb.m3u
freearhey fcc830247b Update it.m3u
freearhey 12991930e2 Update hu.m3u
freearhey bd7708b721 Update hn.m3u
freearhey dc97b0c36f Update gr.m3u
freearhey c1747d158d Update de.m3u
freearhey e6fb22d5a4 Update ae.m3u
trancer1994 d666b23827
Update ca.m3u
trancer1994 f836b37332
Update at.m3u
trancer1994 b404e8bb41
Update kw.m3u
trancer1994 0aae98e2c7
Update jo.m3u
trancer1994 8704b98a0e
Update ir.m3u
trancer1994 cc223e73a3
Update kw.m3u
trancer1994 aa7bd375b3
Update eg.m3u
Shadix A 8bd51df7c4
JP : Changes
Delete all Animax channels : No stream works as of today.
trancer1994 28ee54ce8e
Update ir.m3u
freearhey c543f8277a Update fr.m3u
freearhey a4a3378298 Update cn.m3u
Shadix A 8f49fcc0a9
AR : Changes
- Delete ABC TV : Link doesn't work + it's Paraguayan, not Argentinian : https://www.youtube.com/channel/UCEklbFbPoMaV1ciEb-0mAxg
- Use playlist for 24/7 Canal de Noticias (dattalive.com host)
freearhey 33100cde04 Update br.m3u
Added missing resolution
freearhey 0890ef74a9 Update hn.m3u
freearhey ef18c66903 Update kp.m3u
freearhey fe5b0e3ede Update jp.m3u
Removed broken link ()
freearhey e7c2d14030 Update br.m3u
freearhey 41aea0a7cd Update tz.m3u
Removed broken links ()
freearhey 5ede7cd8cb Update us.m3u
Removed broken links
freearhey 8f0c9d9919 Merge branch 'master' into add-missing-resolution
freearhey 16e0e31ed2 Update tr.m3u
freearhey 9c6c638a59 Update ru.m3u
freearhey 67a92269ab Update ro.m3u
freearhey 276aedfa77 Update ng.m3u
freearhey 15fee197ff Update mz.m3u
freearhey 7924e18795 Update lb.m3u
freearhey 689713eb7f Update in.m3u
freearhey 868ebac37d Update hu.m3u
freearhey a25ba187d7 Update hn.m3u
freearhey a3d64edfba Update fr.m3u
freearhey 68ed5784cd Update de.m3u
freearhey bfbc236e34 Update cy.m3u
freearhey d6d276a421 Update cm.m3u
freearhey 4fc2a8fa92 Update cl.m3u
freearhey 3eeef6d9b3 Update br.m3u
freearhey fcc188bedd Update bd.m3u
freearhey 99bde7c544 Update at.m3u
freearhey 1eece05c4c Update playlists
Aleksandr Statciuk 2388390720
Update at.m3u
Aleksandr Statciuk d2486f5af6
Update br.m3u
Aleksandr Statciuk 9e9130792c
Update br.m3u
Aleksandr Statciuk 6a945ac871
Update bd.m3u
Aleksandr Statciuk df479f6405
Update at.m3u
Aleksandr Statciuk a5f5d85777
Update at.m3u
freearhey c4511705da [Bot] Update playlists
github-actions 778e921c1d [Bot] Format playlists
github-actions cb9c67ab2d [Bot] Format al.m3u
github-actions f734a94c60 Merge branch 'master' of https://github.com/iptv-org/iptv
github-actions 5810c5f5ad [Bot] Format cr.m3u
github-actions 8ecff7cb7c Merge branch 'master' of https://github.com/iptv-org/iptv
github-actions 34e1e35471 [Bot] Format cw.m3u
github-actions d8fc05c5da Merge branch 'master' of https://github.com/iptv-org/iptv
github-actions 22592e2464 [Bot] Format az.m3u
github-actions f851650169 Merge branch 'master' of https://github.com/iptv-org/iptv
github-actions 9c17fb780d [Bot] Format at.m3u
github-actions 8677ce0b52 Merge branch 'master' of https://github.com/iptv-org/iptv
github-actions e3aca8e0dc [Bot] Format bh.m3u
github-actions 89d343f740 [Bot] Format bb.m3u
github-actions 3f7c4da734 [Bot] Remove duplicates
trancer1994 36e7e5d2f4
Update sa.m3u
trancer1994 61d80e55f5
Update eg.m3u
trancer1994 2466cc329a
Update de.m3u
The Folx network might actually be located in Slovenia and not Germany. If it's located in Slovenia, please move it to Slovenia's file in the channels folder.
trancer1994 27d2d3b660
Update et.m3u
trancer1994 b7607c078b
Update ro.m3u
trancer1994 fe46fd3d15
Update ru.m3u
trancer1994 b40cae10e7
Update it.m3u
trancer1994 09236b1929
Update pt.m3u
trancer1994 46409d4767
Update it.m3u
trancer1994 82116c5360
Update iq.m3u
trancer1994 ae94ab2eb5
Update ir.m3u
trancer1994 e9e6db0b89
Update ca.m3u
trancer1994 71fb047b6c
Update it.m3u
trancer1994 63e33994e5
Update us.m3u
trancer1994 3c10396c14
Update es.m3u
trancer1994 f595f0cd31
Update pe.m3u
trancer1994 18972b7607
Update do.m3u
trancer1994 5b3c091260
Update ph.m3u
trancer1994 2f7d8730db
Update th.m3u
trancer1994 96c2ab46b6
Update uk.m3u
trancer1994 f3ed526e68
Update cu.m3u
trancer1994 518df4d568
Update ps.m3u
trancer1994 094e0b550e
Update hu.m3u
trancer1994 cfcd03094e
Update il.m3u
trancer1994 dc3cbf70d4
Update in.m3u
trancer1994 a1da1f6ca1
Update pk.m3u
trancer1994 6c5b6e1b40
Update in.m3u
trancer1994 25c078e289
Update uk.m3u
trancer1994 4e12ae7a78
Update xk.m3u
trancer1994 2b02180f94
Update al.m3u
trancer1994 e1761b9eaf
Update kz.m3u
trancer1994 50b326882d
Update ua.m3u
trancer1994 016084fbc4
Update ru.m3u
trancer1994 1fc53c1c79
Update ye.m3u
trancer1994 8e771066e1
Update cr.m3u
trancer1994 3d5150f1ef
Update es.m3u
github-actions 0e1ca23e2b [Bot] Remove duplicates
trancer1994 7259803c1a
Update pl.m3u
trancer1994 7eacba8c7c
Update in.m3u
github-actions 03b7601107 [Bot] Format playlists
freearhey c9644e4493 Update unsorted.m3u
Removed broken link
freearhey 76cf91a618 Update sk.m3u
Removed broken links
trancer1994 9e4faecfcc
Update ro.m3u
trancer1994 4ce9d0ee94
Update in.m3u
trancer1994 ba100083d3
Update hu.m3u
trancer1994 a22d35d934
Update by.m3u
trancer1994 ba492debdb
Update qa.m3u
trancer1994 77dde78bea
Update pl.m3u
trancer1994 e49d9576eb
Update cw.m3u
trancer1994 3114deef44
Update br.m3u
trancer1994 96de203e8c
Update de.m3u
Aleksandr Statciuk bd7f0f1f57
Merge pull request from tilfizyawn/patch-23
Update https://hiplayer.hibridcdn.net url to work with streamlink
Aleksandr Statciuk fb492ef420
Merge pull request from tilfizyawn/patch-24
Update lb.m3u
Aleksandr Statciuk 93c8f30db2
Merge pull request from tilfizyawn/patch-22
Update BBC Persian
Aleksandr Statciuk 1d6a250abb
Merge pull request from tilfizyawn/patch-21
Add BBC Arabic links
trancer1994 7a019c14d0
Update uk.m3u
trancer1994 d53bd2d539
Update us.m3u
tilfizyawn 35e060e44e
Update lb.m3u
tilfizyawn e9008161f4
Update sa.m3u
tilfizyawn aa5e5cb092
Update sa.m3u
tilfizyawn 9bc07b0a1e
Update us.m3u
tilfizyawn 7b16f94102
Update BBC Persian
tilfizyawn 155f453015
Update uk.m3u
Aleksandr Statciuk 86f42c49ee
Merge pull request from Dum4G/patch-1
Fix BBC Arabic 720p and deprecate 480p link
Dum4G 8e9fbb3410
Fix BBC Arabic 720p and deprecate 480p link
BBC is using DASH format from now on, works from VLC tho.  I have found the stream on their official website here https://www.bbc.com/arabic/media-49522519
Alternatively, they're streaming on YT https://www.youtube.com/watch?v=HxI2TxhhS9A
tilfizyawn de47396cce
Update jo.m3u
Aleksandr Statciuk 91975252f4
Merge branch 'master' into patch-93
Aleksandr Statciuk 122b437264
Merge pull request from tilfizyawn/patch-16
Arabic updates, fix channels, remove duplicates
Aleksandr Statciuk 78895ef57a
Merge pull request from trancer1994/patch-163
Update de.m3u
Aleksandr Statciuk 3ccd82cd10
Merge pull request from trancer1994/patch-162
Update ad.m3u
Aleksandr Statciuk 44e3d0f5cd
Merge pull request from tilfizyawn/patch-19
Remove dead elahmad.com mirrors
Aleksandr Statciuk acbdaf4c6c
Merge pull request from trancer1994/patch-161
Update ro.m3u
Aleksandr Statciuk f03197ab37
Merge pull request from trancer1994/patch-160
Update it.m3u
Aleksandr Statciuk 8f1094fc52
Merge pull request from trancer1994/patch-159
Update lu.m3u
Aleksandr Statciuk b30206a373
Merge branch 'master' into patch-158
Aleksandr Statciuk fd8e760993
Merge pull request from trancer1994/patch-157
Update pr.m3u
Aleksandr Statciuk be42c9d307
Merge pull request from trancer1994/patch-156
Update ge.m3u
Aleksandr Statciuk 80ca4edaee
Merge pull request from trancer1994/patch-155
Update bh.m3u
Aleksandr Statciuk a2c32e68d9
Merge pull request from trancer1994/patch-154
Update jo.m3u
Aleksandr Statciuk 66bf020316
Merge pull request from trancer1994/patch-153
Update bf.m3u
Aleksandr Statciuk 86eabca490
Merge pull request from trancer1994/patch-152
Update ug.m3u
Aleksandr Statciuk d177341ad3
Merge pull request from trancer1994/patch-151
Update si.m3u
Aleksandr Statciuk 25c0a3590b
Merge pull request from trancer1994/patch-150
Update sk.m3u
Aleksandr Statciuk 3685553cfc
Merge pull request from trancer1994/patch-148
Update id.m3u
Aleksandr Statciuk 42278e0b38
Merge pull request from trancer1994/patch-147
Update ie.m3u
Aleksandr Statciuk b6e516d8e9
Merge branch 'master' into patch-146
Aleksandr Statciuk b803d8ece9
Merge branch 'master' into patch-145
Aleksandr Statciuk bac0b54b6d
Merge branch 'master' into patch-144
Aleksandr Statciuk 25b591ae71
Merge pull request from trancer1994/patch-143
Update cz.m3u
Aleksandr Statciuk 909a01c0f4
Merge pull request from trancer1994/patch-142
Update bo.m3u
Aleksandr Statciuk a04bd2c7c2
Merge pull request from trancer1994/patch-140
Update cr.m3u
Aleksandr Statciuk 2b32fb119f
Merge branch 'master' into patch-141
trancer1994 f7cf9be11b
Update de.m3u
Aleksandr Statciuk 955264fab1
Merge branch 'master' into patch-136
trancer1994 2209b46e17
Update ad.m3u
Aleksandr Statciuk b49b70ad44
Merge pull request from trancer1994/patch-138
Update no.m3u
trancer1994 245bc9f756
Update ro.m3u
tilfizyawn 20790752b5
Update ae.m3u
Aleksandr Statciuk f3e21332f1
Merge branch 'master' into patch-137
trancer1994 f7fcdb9835
Update it.m3u
Aleksandr Statciuk 7c91356462
Merge pull request from trancer1994/patch-135
Create sn.m3u
trancer1994 2fdf4d7679
Update lu.m3u
tilfizyawn 4c0d92054b
Update sa.m3u
Aleksandr Statciuk 449a56b2b3
Merge pull request from trancer1994/patch-133
Update se.m3u
tilfizyawn 52548c3a4a
Update sa.m3u
Aleksandr Statciuk a2c1cdf4d1
Merge pull request from trancer1994/patch-132
Update mx.m3u
tilfizyawn 5229382c9f
Update sa.m3u
Aleksandr Statciuk 531ea7dbe9
Merge pull request from trancer1994/patch-131
Update cl.m3u
trancer1994 526b399a6e
Update cr.m3u
Aleksandr Statciuk e40e62d0ab
Merge pull request from trancer1994/patch-130
Update co.m3u
tilfizyawn 9b1eca8e1b
Update ca.m3u
trancer1994 ffc5c5dad3
Update pr.m3u
trancer1994 272489815d
Update ge.m3u
Aleksandr Statciuk 992e9b419c
Merge branch 'master' into patch-128
Aleksandr Statciuk 3ae60ddf00
Merge pull request from trancer1994/patch-127
Update uk.m3u
Aleksandr Statciuk faca75ccae
Merge pull request from trancer1994/patch-126
Update kr.m3u
Aleksandr Statciuk dcc6b7e1d2
Merge branch 'master' into patch-125