youtube-dl
10 years agoMerge branch 'master' into subtitles_rework
Ismael Mejia [Wed, 11 Sep 2013 12:26:48 +0000 (14:26 +0200)]
Merge branch 'master' into subtitles_rework

10 years agoIn the supported sites page, sort the extractors in case insensitive
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 10:04:27 +0000 (12:04 +0200)]
In the supported sites page, sort the extractors in case insensitive

10 years agorelease 2013.11.09
Philipp Hagemeister [Wed, 11 Sep 2013 09:30:10 +0000 (11:30 +0200)]
release 2013.11.09

10 years ago[youtube] update algo for length 85 (fixes #1408 and fixes #1406)
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 09:24:58 +0000 (11:24 +0200)]
[youtube] update algo for length 85 (fixes #1408 and fixes #1406)

10 years ago[francetv] Add an extractor for francetvinfo.fr (closes #1317)
Jaime Marquínez Ferrándiz [Tue, 10 Sep 2013 13:50:34 +0000 (15:50 +0200)]
[francetv] Add an extractor for francetvinfo.fr (closes #1317)

It uses the same system as Pluzz, create a base class for both extractors.

10 years agoMerge pull request #1402 from Rudloff/canalc2
Philipp Hagemeister [Tue, 10 Sep 2013 10:19:37 +0000 (03:19 -0700)]
Merge pull request #1402 from Rudloff/canalc2

Wrong property name

10 years agoWrong property name
Pierre Rudloff [Tue, 10 Sep 2013 10:13:22 +0000 (12:13 +0200)]
Wrong property name

10 years agoAdd an extractor for pluzz.francetv.fr (closes PR #1399)
Pierre Rudloff [Sun, 8 Sep 2013 19:55:11 +0000 (21:55 +0200)]
Add an extractor for pluzz.francetv.fr (closes PR #1399)

10 years agorelease 2013.09.10
Philipp Hagemeister [Tue, 10 Sep 2013 09:25:11 +0000 (11:25 +0200)]
release 2013.09.10

10 years agoAdd an extractor for Slideshare (closes #1400)
Jaime Marquínez Ferrándiz [Tue, 10 Sep 2013 09:19:58 +0000 (11:19 +0200)]
Add an extractor for Slideshare (closes #1400)

10 years ago[sohu] add support for my.tv.sohu.com urls (fixes #1398)
Jaime Marquínez Ferrándiz [Mon, 9 Sep 2013 17:56:16 +0000 (19:56 +0200)]
[sohu] add support for my.tv.sohu.com urls (fixes #1398)

10 years agoFix the minutes part in FileDownloader.format_seconds (fixed #1397)
Jaime Marquínez Ferrándiz [Mon, 9 Sep 2013 08:38:54 +0000 (10:38 +0200)]
Fix the minutes part in FileDownloader.format_seconds (fixed #1397)

It printed for the minutes the result of (seconds // 60)

10 years ago[youtube] Modify the regex to match ids of length 11 (fixes #1396)
Jaime Marquínez Ferrándiz [Mon, 9 Sep 2013 08:33:12 +0000 (10:33 +0200)]
[youtube] Modify the regex to match ids of length 11 (fixes #1396)

In urls like http://www.youtube.com/watch?v=BaW_jenozKcsharePLED17F32AD9753930 you can't split the query string and ids always have that length.

10 years agoRevert "[youtube] Fix detection of tags from HLS videos."
Jaime Marquínez Ferrándiz [Sun, 8 Sep 2013 16:49:10 +0000 (18:49 +0200)]
Revert "[youtube] Fix detection of tags from HLS videos."

They have undo the change

This reverts commit 0638ad9999e7c374b253d0e13f4e3a20ef0b1171.

10 years agorelease 2013.09.07
Philipp Hagemeister [Sat, 7 Sep 2013 20:29:15 +0000 (22:29 +0200)]
release 2013.09.07

10 years agoMerge branch 'master' of github.com:rg3/youtube-dl
Philipp Hagemeister [Sat, 7 Sep 2013 20:28:54 +0000 (22:28 +0200)]
Merge branch 'master' of github.com:rg3/youtube-dl

10 years agoMerge branch 'master' into subtitles_rework
Ismael Mejia [Fri, 6 Sep 2013 21:23:23 +0000 (23:23 +0200)]
Merge branch 'master' into subtitles_rework

10 years ago[generic] If the url doesn't specify the protocol, then try to extract prepending...
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 16:39:35 +0000 (18:39 +0200)]
[generic] If the url doesn't specify the protocol, then try to extract prepending ''

10 years ago[daylimotion] accept embed urls (fixes #1386)
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 16:36:07 +0000 (18:36 +0200)]
[daylimotion] accept embed urls (fixes #1386)

10 years agoAdd an extractor for Metacritic
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 16:08:07 +0000 (18:08 +0200)]
Add an extractor for Metacritic

10 years ago[subtitles] fixed multiple subtitles language separated by comma after merge
Ismael Mejia [Fri, 6 Sep 2013 14:26:22 +0000 (16:26 +0200)]
[subtitles] fixed multiple subtitles language separated by comma after merge

As mentioned in the pull request, I forgot to include this changes.
https://github.com/rg3/youtube-dl/commit/aa6a10c44a8e2e86f709c5301f9ea6ac3f01f002

10 years ago[youtube] Fix some issues with the detection of playlist/channel urls (reported in...
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 14:24:24 +0000 (16:24 +0200)]
[youtube] Fix some issues with the detection of playlist/channel urls (reported in #1374)

They were being caught by YoutubeUserIE, now it only extracts a url if the rest of extractors aren't suitable.
Now the url tests check that the urls can only be extracted with an specific extractor.

10 years ago[youtube] Fix detection of feeds urls (fixes #1294)
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 12:38:41 +0000 (14:38 +0200)]
[youtube] Fix detection of feeds urls (fixes #1294)

Urls like https://www.youtube.com/feed/watch_later were being as users (before the last changes to YoutubeUserIE, as videos)

10 years agoFix add-versions
Philipp Hagemeister [Fri, 6 Sep 2013 09:07:34 +0000 (11:07 +0200)]
Fix add-versions

10 years agorelease 2013.09.06.1
Philipp Hagemeister [Fri, 6 Sep 2013 08:53:35 +0000 (10:53 +0200)]
release 2013.09.06.1

10 years agoMerge remote-tracking branch 'origin/master'
Philipp Hagemeister [Fri, 6 Sep 2013 08:53:24 +0000 (10:53 +0200)]
Merge remote-tracking branch 'origin/master'

10 years agoDo not re-download files for hashsum generation (Fixes #1383)
Philipp Hagemeister [Fri, 6 Sep 2013 08:51:53 +0000 (10:51 +0200)]
Do not re-download files for hashsum generation (Fixes #1383)

10 years ago[youtube] Users: download from the api in json to simplify extraction (fixes #1358)
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 08:41:46 +0000 (10:41 +0200)]
[youtube] Users: download from the api in json to simplify extraction (fixes #1358)

There could be duplicate videos or other videos if the description have links.

10 years ago[youtube] Fix detection of tags from HLS videos.
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 08:25:31 +0000 (10:25 +0200)]
[youtube] Fix detection of tags from HLS videos.

10 years agorelease 2013.09.06
Philipp Hagemeister [Fri, 6 Sep 2013 08:13:33 +0000 (10:13 +0200)]
release 2013.09.06

10 years agoMerge pull request #1378 from patrickslin/patch-6
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 07:49:50 +0000 (09:49 +0200)]
Merge pull request #1378 from patrickslin/patch-6

Vevo sig changed again, please update for us! Thanks very much! (fixes #...

10 years agoVevo sig changed again, please update for us! Thanks very much! (fixes #1375)
patrickslin [Fri, 6 Sep 2013 00:38:03 +0000 (17:38 -0700)]
Vevo sig changed again, please update for us! Thanks very much! (fixes #1375)

10 years ago[youtube] Urls like youtube.com/NASA are now interpreted as users (fixes #1069)
Jaime Marquínez Ferrándiz [Thu, 5 Sep 2013 20:38:23 +0000 (22:38 +0200)]
[youtube] Urls like youtube.com/NASA are now interpreted as users (fixes #1069)

Video urls like http://youtube.com/BaW_jenozKc are not valid, but http://youtu.be/BaW_jenozKc is correct.

10 years agorelease 2013.09.05
Philipp Hagemeister [Thu, 5 Sep 2013 20:30:50 +0000 (22:30 +0200)]
release 2013.09.05

10 years ago[youtube] Playlists: extract the videos id from ['media$group']['yt$videoid'] (fixes...
Jaime Marquínez Ferrándiz [Thu, 5 Sep 2013 19:40:04 +0000 (21:40 +0200)]
[youtube] Playlists: extract the videos id from ['media$group']['yt$videoid'] (fixes #1374)

'media$player' is not defined for private videos.

10 years ago[generic] Recognize html5 video in the format '<video src=".+?"' and only unquote...
Jaime Marquínez Ferrándiz [Thu, 5 Sep 2013 16:02:17 +0000 (18:02 +0200)]
[generic] Recognize html5 video in the format '<video src=".+?"' and only unquote the url when extracting the id (fixes #1372)

10 years agoAdd extractor for tvcast.naver.com (closes #1331)
Jaime Marquínez Ferrándiz [Thu, 5 Sep 2013 08:53:40 +0000 (10:53 +0200)]
Add extractor for tvcast.naver.com (closes #1331)

10 years ago[daum] Get the video page from a canonical url to extract the full id (fixes #1373...
Jaime Marquínez Ferrándiz [Thu, 5 Sep 2013 08:08:17 +0000 (10:08 +0200)]
[daum] Get the video page from a canonical url to extract the full id (fixes #1373) and extract description.

10 years agoCredit @Huarong for tv.sohu.com
Jaime Marquínez Ferrándiz [Wed, 4 Sep 2013 20:09:22 +0000 (22:09 +0200)]
Credit  @Huarong for tv.sohu.com

10 years agoAdd extractor for daum.net (closes #1330)
Jaime Marquínez Ferrándiz [Wed, 4 Sep 2013 20:06:50 +0000 (22:06 +0200)]
Add extractor for daum.net (closes #1330)

10 years agorelease 2013.09.04
Philipp Hagemeister [Wed, 4 Sep 2013 12:33:32 +0000 (14:33 +0200)]
release 2013.09.04

10 years agoMerge pull request #1341 from xanadu/master
Philipp Hagemeister [Wed, 4 Sep 2013 01:52:12 +0000 (18:52 -0700)]
Merge pull request #1341 from xanadu/master

add support for "-f mp4" for YouTube

10 years agoAHLS -> Apple HTTP Live Streaming
Allan Zhou [Wed, 4 Sep 2013 01:49:35 +0000 (18:49 -0700)]
AHLS -> Apple HTTP Live Streaming

10 years agoMerge pull request #1363 from Rudloff/defense
Philipp Hagemeister [Wed, 4 Sep 2013 01:23:08 +0000 (18:23 -0700)]
Merge pull request #1363 from Rudloff/defense

defense.gouv.fr

10 years agoMerge remote-tracking branch 'upstream/master'
Allan Zhou [Tue, 3 Sep 2013 19:22:29 +0000 (12:22 -0700)]
Merge remote-tracking branch 'upstream/master'

10 years agoSuggested by @phihag
Pierre Rudloff [Tue, 3 Sep 2013 10:03:19 +0000 (12:03 +0200)]
Suggested by @phihag

10 years ago[orf] Remove the test video, they seem to expire in one week
Jaime Marquínez Ferrándiz [Tue, 3 Sep 2013 09:51:01 +0000 (11:51 +0200)]
[orf] Remove the test video, they seem to expire in one week

10 years ago[dailymotion] improve the regex for extracting the video info
Jaime Marquínez Ferrándiz [Tue, 3 Sep 2013 09:33:59 +0000 (11:33 +0200)]
[dailymotion] improve the regex for extracting the video info

10 years ago[vimeo] Handle Assertions Error when trying to get the description
Jaime Marquínez Ferrándiz [Tue, 3 Sep 2013 09:11:36 +0000 (11:11 +0200)]
[vimeo] Handle Assertions Error when trying to get the description

In some pages the html tags are not closed, python 2.6 cannot handle it.

10 years ago[vimeo] add support for videos that embed the download url in the player page (fixes...
Jaime Marquínez Ferrándiz [Tue, 3 Sep 2013 08:48:56 +0000 (10:48 +0200)]
[vimeo] add support for videos that embed the download url in the player page (fixes #1364)

10 years agoExtractor for defense.gouv.fr
Pierre Rudloff [Mon, 2 Sep 2013 23:51:17 +0000 (01:51 +0200)]
Extractor for defense.gouv.fr

10 years agoMerge remote-tracking branch 'upstream/master'
Pierre Rudloff [Mon, 2 Sep 2013 23:27:49 +0000 (01:27 +0200)]
Merge remote-tracking branch 'upstream/master'

10 years agoAdd an extractor for VeeHD (closes #1359)
Jaime Marquínez Ferrándiz [Mon, 2 Sep 2013 09:54:09 +0000 (11:54 +0200)]
Add an extractor for VeeHD (closes #1359)

10 years ago[metacafe] Add more cases for detecting the uploader detection (reported in #1343)
Jaime Marquínez Ferrándiz [Sat, 31 Aug 2013 20:35:39 +0000 (22:35 +0200)]
[metacafe] Add more cases for detecting the uploader detection (reported in #1343)

10 years agoAdd an automatic page generator for the supported sites (related #156)
Jaime Marquínez Ferrándiz [Sat, 31 Aug 2013 13:05:59 +0000 (15:05 +0200)]
Add an automatic page generator for the supported sites (related #156)

They are listed in the "supportedsites.html" page.

10 years agoMerge remote-tracking branch 'upstream/master'
Allan Zhou [Sat, 31 Aug 2013 00:51:59 +0000 (17:51 -0700)]
Merge remote-tracking branch 'upstream/master'

10 years agoadd support for "-f mp4" for YouTube
Allan Zhou [Sat, 31 Aug 2013 00:51:50 +0000 (17:51 -0700)]
add support for "-f mp4" for YouTube

10 years agoMerge remote-tracking branch 'upstream/master'
Pierre Rudloff [Fri, 30 Aug 2013 22:37:29 +0000 (00:37 +0200)]
Merge remote-tracking branch 'upstream/master'

10 years agorelease 2013.08.30
Philipp Hagemeister [Fri, 30 Aug 2013 19:02:07 +0000 (21:02 +0200)]
release 2013.08.30

10 years ago[youtube] update algo for length 86
Jaime Marquínez Ferrándiz [Fri, 30 Aug 2013 18:49:51 +0000 (20:49 +0200)]
[youtube] update algo for length 86

10 years ago[youtube] Fix typo in the _VALID_URL for YoutubeFavouritesIE, it was intended to...
Jaime Marquínez Ferrándiz [Fri, 30 Aug 2013 18:13:05 +0000 (20:13 +0200)]
[youtube] Fix typo in the _VALID_URL for YoutubeFavouritesIE, it was intended to also match :ytfavourites

10 years agoAdd youtube keywords to the bash completion script
Jaime Marquínez Ferrándiz [Fri, 30 Aug 2013 18:11:53 +0000 (20:11 +0200)]
Add youtube keywords to the bash completion script

10 years agorelease 2013.08.29
Philipp Hagemeister [Thu, 29 Aug 2013 21:29:34 +0000 (23:29 +0200)]
release 2013.08.29

10 years ago[youtube] update algo for length 84
Jaime Marquínez Ferrándiz [Thu, 29 Aug 2013 20:44:29 +0000 (22:44 +0200)]
[youtube] update algo for length 84

Only appears sometimes, nearly identical to length 86.

10 years ago[youtube] update algo for length 86 (fixes #1349)
Jaime Marquínez Ferrándiz [Thu, 29 Aug 2013 20:33:58 +0000 (22:33 +0200)]
[youtube] update algo for length 86 (fixes #1349)

10 years ago[ign] update 1up extractor to work with the updated IGNIE
Jaime Marquínez Ferrándiz [Thu, 29 Aug 2013 19:51:09 +0000 (21:51 +0200)]
[ign] update 1up extractor to work with the updated IGNIE

10 years ago[ign] extract videos from articles pages
Jaime Marquínez Ferrándiz [Thu, 29 Aug 2013 19:39:36 +0000 (21:39 +0200)]
[ign] extract videos from articles pages

10 years agoMerge pull request #1347 from whydoubt/fix_orf_at
Jaime Marquínez Ferrándiz [Thu, 29 Aug 2013 18:05:38 +0000 (11:05 -0700)]
Merge pull request #1347 from whydoubt/fix_orf_at

Fix orf.at extractor by adding file coding mark

10 years agoFix orf.at extractor by adding file coding mark
Jeff Smith [Thu, 29 Aug 2013 17:51:38 +0000 (12:51 -0500)]
Fix orf.at extractor by adding file coding mark

10 years agoAdd an extractor for orf.at (closes #1346)
Jaime Marquínez Ferrándiz [Thu, 29 Aug 2013 17:16:07 +0000 (19:16 +0200)]
Add an extractor for orf.at (closes #1346)

Make find_xpath_attr also accept numbers in the value

10 years agoMerge pull request #1342 from whydoubt/fix_mit_26
Jaime Marquínez Ferrándiz [Thu, 29 Aug 2013 11:42:08 +0000 (13:42 +0200)]
Merge pull request #1342 from whydoubt/fix_mit_26

Fix MIT extractor for Python 2.6

10 years agoUpdate descriptions checksum for some test for Unistra and Youtube
Jaime Marquínez Ferrándiz [Thu, 29 Aug 2013 11:41:59 +0000 (13:41 +0200)]
Update descriptions checksum for some test for Unistra and Youtube

10 years agoAlso print the field that fails if it is a md5 checksum
Jaime Marquínez Ferrándiz [Thu, 29 Aug 2013 10:15:45 +0000 (12:15 +0200)]
Also print the field that fails if it is a md5 checksum

10 years agoFix detection of the webpage charset if it's declared using ' instead of "
Jaime Marquínez Ferrándiz [Thu, 29 Aug 2013 09:35:15 +0000 (11:35 +0200)]
Fix detection of the webpage charset if it's declared using ' instead of "

Like in "<meta charset='utf-8'/>"

10 years agoFix MIT extractor for Python 2.6
Jeff Smith [Wed, 28 Aug 2013 19:00:59 +0000 (14:00 -0500)]
Fix MIT extractor for Python 2.6

The HTML for the MIT page does not parse cleanly for Python 2.6 due
to script tags within an actual script element.  The offending piece
is inside a comment block, so removing all such comment blocks
fixes the parsing.

10 years agoMerge remote-tracking branch 'upstream/master'
Allan Zhou [Wed, 28 Aug 2013 17:19:28 +0000 (10:19 -0700)]
Merge remote-tracking branch 'upstream/master'

10 years agorelease 2013.08.28.1
Philipp Hagemeister [Wed, 28 Aug 2013 17:00:17 +0000 (19:00 +0200)]
release 2013.08.28.1

10 years agoMerge remote-tracking branch 'upstream/master'
Allan Zhou [Wed, 28 Aug 2013 16:57:28 +0000 (09:57 -0700)]
Merge remote-tracking branch 'upstream/master'

10 years agoMerge remote-tracking branch 'origin/master'
Philipp Hagemeister [Wed, 28 Aug 2013 16:22:33 +0000 (18:22 +0200)]
Merge remote-tracking branch 'origin/master'

10 years agoMerge remote-tracking branch 'rzhxeo/youporn-hd'
Philipp Hagemeister [Wed, 28 Aug 2013 16:22:28 +0000 (18:22 +0200)]
Merge remote-tracking branch 'rzhxeo/youporn-hd'

Conflicts:
youtube_dl/utils.py

10 years agoYoupornIE: Clean up extraction of hd video
rzhxeo [Wed, 28 Aug 2013 14:04:48 +0000 (16:04 +0200)]
YoupornIE: Clean up extraction of hd video

10 years agoLet aes_decrypt_text return bytes instead of unicode
rzhxeo [Wed, 28 Aug 2013 14:03:35 +0000 (16:03 +0200)]
Let aes_decrypt_text return bytes instead of unicode

10 years agoFix division bug in aes.py
rzhxeo [Wed, 28 Aug 2013 14:01:43 +0000 (16:01 +0200)]
Fix division bug in aes.py

10 years agoAdd intlist_to_bytes to utils.py
rzhxeo [Wed, 28 Aug 2013 13:59:07 +0000 (15:59 +0200)]
Add intlist_to_bytes to utils.py

10 years agoMerge pull request #1 from phihag/youporn-hd-pr
rzhxeo [Wed, 28 Aug 2013 13:23:33 +0000 (06:23 -0700)]
Merge pull request #1 from phihag/youporn-hd-pr

Allow changes to run under Python 3

10 years agoHide the password and username in verbose mode (closes #1089)
Jaime Marquínez Ferrándiz [Sat, 20 Jul 2013 10:49:24 +0000 (12:49 +0200)]
Hide the password and username in verbose mode (closes #1089)

10 years agoAllow changes to run under Python 3
Philipp Hagemeister [Wed, 28 Aug 2013 12:28:55 +0000 (14:28 +0200)]
Allow changes to run under Python 3

10 years agoMerge remote-tracking branch 'origin/master'
Philipp Hagemeister [Wed, 28 Aug 2013 12:02:40 +0000 (14:02 +0200)]
Merge remote-tracking branch 'origin/master'

10 years ago[sohu] Handle encoding, and fix tests
Philipp Hagemeister [Wed, 28 Aug 2013 11:59:08 +0000 (13:59 +0200)]
[sohu] Handle encoding, and fix tests

10 years agoPostProcessingError holds the message in the 'msg' property, not in 'message' (fixes...
Jaime Marquínez Ferrándiz [Wed, 28 Aug 2013 11:37:31 +0000 (13:37 +0200)]
PostProcessingError holds the message in the 'msg' property, not in 'message' (fixes #1323)

Causes DeprecationWarning: http://www.python.org/dev/peps/pep-0352/

10 years agoMerge remote-tracking branch 'Huarong/master'
Philipp Hagemeister [Wed, 28 Aug 2013 11:10:59 +0000 (13:10 +0200)]
Merge remote-tracking branch 'Huarong/master'

10 years agoMerge remote-tracking branch 'origin/reuse_ies'
Philipp Hagemeister [Wed, 28 Aug 2013 11:05:21 +0000 (13:05 +0200)]
Merge remote-tracking branch 'origin/reuse_ies'

10 years agoMerge remote-tracking branch 'origin/master'
Philipp Hagemeister [Wed, 28 Aug 2013 10:57:44 +0000 (12:57 +0200)]
Merge remote-tracking branch 'origin/master'

10 years agoFix platform name in Python 2 with --verbose (Closes #1228)
Philipp Hagemeister [Wed, 28 Aug 2013 10:57:10 +0000 (12:57 +0200)]
Fix platform name in Python 2 with --verbose (Closes #1228)

10 years agoAdd extractors for video.mit.edu and techtv.mit.edu (closes #1327)
Jaime Marquínez Ferrándiz [Wed, 28 Aug 2013 10:51:22 +0000 (12:51 +0200)]
Add extractors for video.mit.edu and techtv.mit.edu (closes #1327)

video.mit.edu just embeds the videos from techtv.mit.edu

10 years agoRemove unused imports
Philipp Hagemeister [Wed, 28 Aug 2013 10:47:38 +0000 (12:47 +0200)]
Remove unused imports

10 years ago[generic] simply use urljoin
Philipp Hagemeister [Wed, 28 Aug 2013 10:47:27 +0000 (12:47 +0200)]
[generic] simply use urljoin

10 years agoMerge remote-tracking branch 'upstream/master'
Pierre Rudloff [Wed, 28 Aug 2013 10:20:12 +0000 (12:20 +0200)]
Merge remote-tracking branch 'upstream/master'

10 years agoPrint playpath with --get-url (Fixes #1334)
Philipp Hagemeister [Wed, 28 Aug 2013 10:14:45 +0000 (12:14 +0200)]
Print playpath with --get-url (Fixes #1334)

10 years agoMerge remote-tracking branch 'upstream/master'
Pierre Rudloff [Wed, 28 Aug 2013 10:10:34 +0000 (12:10 +0200)]
Merge remote-tracking branch 'upstream/master'