]> git.sesse.net Git - kdenlive/log
kdenlive
11 years agoWhen opening project, do not load unused producers at startup, only on demand (when...
Jean-Baptiste Mardelle [Tue, 18 Dec 2012 23:05:59 +0000 (00:05 +0100)]
When opening project, do not load unused producers at startup, only on demand (when clip is selected), makes project opening much faster

11 years agoFix seeking in monitor ruler sometimes not working
Jean-Baptiste Mardelle [Tue, 18 Dec 2012 11:23:40 +0000 (12:23 +0100)]
Fix seeking in monitor ruler sometimes not working

11 years agoRe-enable monitor overlay info & fix openGL crash
Jean-Baptiste Mardelle [Tue, 18 Dec 2012 00:27:28 +0000 (01:27 +0100)]
Re-enable monitor overlay info & fix openGL crash

11 years agoFix seeking with OpenGl monitor
Jean-Baptiste Mardelle [Tue, 18 Dec 2012 00:23:58 +0000 (01:23 +0100)]
Fix seeking with OpenGl monitor

11 years agoFix dvd wizard chapter offset: http://www.kdenlive.org/mantis/view.php?id=864
Jean-Baptiste Mardelle [Mon, 17 Dec 2012 21:12:00 +0000 (22:12 +0100)]
Fix dvd wizard chapter offset: http://www.kdenlive.org/mantis/view.php?id=864

11 years agoCorrectly reload clip on force full luma:
Jean-Baptiste Mardelle [Mon, 17 Dec 2012 20:23:27 +0000 (21:23 +0100)]
Correctly reload clip on force full luma:

11 years agoFix play zone sometimes blocking seeking: http://kdenlive.org/mantis/view.php?id...
Jean-Baptiste Mardelle [Mon, 17 Dec 2012 16:37:56 +0000 (17:37 +0100)]
Fix play zone sometimes blocking seeking: http://kdenlive.org/mantis/view.php?id=2876

11 years agoFix keyframe position widget: http://www.kdenlive.org/mantis/view.php?id=2874
Jean-Baptiste Mardelle [Sun, 16 Dec 2012 23:05:06 +0000 (00:05 +0100)]
Fix keyframe position widget: http://www.kdenlive.org/mantis/view.php?id=2874

11 years agoFix moving of splitted clips when using CTRL + A: http://www.kdenlive.org/mantis...
Jean-Baptiste Mardelle [Sun, 16 Dec 2012 22:40:30 +0000 (23:40 +0100)]
Fix moving of splitted clips when using CTRL + A: http://www.kdenlive.org/mantis/view.php?id=2830

11 years agoFix seeking after play zone:http://www.kdenlive.org/mantis/view.php?id=2876
Jean-Baptiste Mardelle [Sun, 16 Dec 2012 19:14:07 +0000 (20:14 +0100)]
Fix seeking after play zone:http://www.kdenlive.org/mantis/view.php?id=2876

11 years agoEnable split audio and other audio actions only when a clip with audio is selected
Jean-Baptiste Mardelle [Sun, 16 Dec 2012 18:57:43 +0000 (19:57 +0100)]
Enable split audio and other audio actions only when a clip with audio is selected

11 years agoFix forward playing after playing zone, fix make pausing with 'k' similar to space:
Jean-Baptiste Mardelle [Sun, 16 Dec 2012 18:24:25 +0000 (19:24 +0100)]
Fix forward playing after playing zone, fix make pausing with 'k' similar to space:
http://www.kdenlive.org/mantis/view.php?id=2869
http://www.kdenlive.org/mantis/view.php?id=2876

11 years agoFix crash on scene cut analysis: http://kdenlive.org/mantis/view.php?id=2873
Jean-Baptiste Mardelle [Sun, 16 Dec 2012 16:58:53 +0000 (17:58 +0100)]
Fix crash on scene cut analysis: http://kdenlive.org/mantis/view.php?id=2873

11 years agoAdd missing signal displayMessage()
Brian Matherly [Sat, 15 Dec 2012 03:29:28 +0000 (21:29 -0600)]
Add missing signal displayMessage()

11 years agoAdd new localfiledate keywword to dynamic text filter
Brian Matherly [Sat, 15 Dec 2012 03:12:44 +0000 (21:12 -0600)]
Add new localfiledate keywword to dynamic text filter

11 years agoFix freeze on backwards playing & play icon not correctly updated:http://kdenlive...
Jean-Baptiste Mardelle [Thu, 13 Dec 2012 22:05:07 +0000 (23:05 +0100)]
Fix freeze on backwards playing & play icon not correctly updated:http://kdenlive.org/mantis/view.php?id=2869

11 years agoFix play / pause: http://kdenlive.org/mantis/view.php?id=2317
Jean-Baptiste Mardelle [Thu, 13 Dec 2012 00:41:33 +0000 (01:41 +0100)]
Fix play / pause: http://kdenlive.org/mantis/view.php?id=2317

11 years agoFix thumbnails of transparent clips sometimes messed up
Jean-Baptiste Mardelle [Wed, 12 Dec 2012 23:39:15 +0000 (00:39 +0100)]
Fix thumbnails of transparent clips sometimes messed up

11 years agoFixes for dynamic text filter, patch by Brian Matherly: http://www.kdenlive.org/manti...
Jean-Baptiste Mardelle [Wed, 12 Dec 2012 21:45:55 +0000 (22:45 +0100)]
Fixes for dynamic text filter, patch by Brian Matherly: http://www.kdenlive.org/mantis/view.php?id=2858

11 years agoForgotten commit fixing play / pause issues
Jean-Baptiste Mardelle [Wed, 12 Dec 2012 20:28:48 +0000 (21:28 +0100)]
Forgotten commit fixing play / pause issues

11 years agoImprove drawing of clips to better see if there is an empty frame between 2 clips...
Jean-Baptiste Mardelle [Wed, 12 Dec 2012 16:09:09 +0000 (17:09 +0100)]
Improve drawing of clips to better see if there is an empty frame between 2 clips:http://www.kdenlive.org/mantis/view.php?id=2855

11 years agoWhen cutting a clip, select the right part of it not the left
Jean-Baptiste Mardelle [Wed, 12 Dec 2012 15:31:58 +0000 (16:31 +0100)]
When cutting a clip, select the right part of it not the left

11 years agoUse Affine transition instead of Composite as default for transparent images / titles
Jean-Baptiste Mardelle [Wed, 12 Dec 2012 15:18:38 +0000 (16:18 +0100)]
Use Affine transition instead of Composite as default for transparent images / titles

11 years agoFix the jkl keys for forward/backwards/pause monitor: http://www.kdenlive.org/mantis...
Jean-Baptiste Mardelle [Wed, 12 Dec 2012 00:29:44 +0000 (01:29 +0100)]
Fix the jkl keys for forward/backwards/pause monitor: http://www.kdenlive.org/mantis/view.php?id=2869

11 years agoFix crash on resetting keyframes with affine transition
Jean-Baptiste Mardelle [Tue, 11 Dec 2012 10:01:08 +0000 (11:01 +0100)]
Fix crash on resetting keyframes with affine transition

11 years agoFix crash on rendering with some project profiles:http://kdenlive.org/mantis/view...
Jean-Baptiste Mardelle [Mon, 10 Dec 2012 22:27:12 +0000 (23:27 +0100)]
Fix crash on rendering with some project profiles:http://kdenlive.org/mantis/view.php?id=2843

11 years agoFix fade problem when resizing clip:http://kdenlive.org/mantis/view.php?id=2843
Jean-Baptiste Mardelle [Mon, 10 Dec 2012 21:50:53 +0000 (22:50 +0100)]
Fix fade problem when resizing clip:http://kdenlive.org/mantis/view.php?id=2843

11 years agoFix Go To Marker feature: http://kdenlive.org/mantis/view.php?id=2866
Jean-Baptiste Mardelle [Sun, 9 Dec 2012 21:20:04 +0000 (22:20 +0100)]
Fix Go To Marker feature: http://kdenlive.org/mantis/view.php?id=2866

11 years agoMake colortap filter usable:http://kdenlive.org/mantis/view.php?id=2854
Jean-Baptiste Mardelle [Sat, 8 Dec 2012 17:06:28 +0000 (18:06 +0100)]
Make colortap filter usable:http://kdenlive.org/mantis/view.php?id=2854

11 years agoFix several DVD Wizard issues
Jean-Baptiste Mardelle [Fri, 7 Dec 2012 18:50:14 +0000 (19:50 +0100)]
Fix several DVD Wizard issues

11 years agoMerge branch 'master' of git://anongit.kde.org/kdenlive
Jean-Baptiste Mardelle [Fri, 7 Dec 2012 13:15:38 +0000 (14:15 +0100)]
Merge branch 'master' of git://anongit.kde.org/kdenlive

11 years agoFix bugs in loading of dvd project (background image/video widget & profile problems)
Jean-Baptiste Mardelle [Mon, 3 Dec 2012 14:09:07 +0000 (15:09 +0100)]
Fix bugs in loading of dvd project (background image/video widget & profile problems)

11 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Sat, 1 Dec 2012 06:59:43 +0000 (07:59 +0100)]
SVN_SILENT made messages (.desktop file)

11 years agoMerge branch 'master' of git://anongit.kde.org/kdenlive
Jean-Baptiste Mardelle [Tue, 27 Nov 2012 21:51:10 +0000 (22:51 +0100)]
Merge branch 'master' of git://anongit.kde.org/kdenlive

11 years agoOpen last opened project, not first one: http://kdenlive.org/mantis/view.php?id=2824
Jean-Baptiste Mardelle [Tue, 27 Nov 2012 21:50:48 +0000 (22:50 +0100)]
Open last opened project, not first one: http://kdenlive.org/mantis/view.php?id=2824

11 years agosave jogshuttle thread shutdown if device is disconnected or becomes
Ed Rogalsky [Thu, 22 Nov 2012 17:02:31 +0000 (18:02 +0100)]
save jogshuttle thread shutdown if device is disconnected or becomes
invalid

minor error handling and logging improvements

11 years agominor code cleanup
Ed Rogalsky [Thu, 22 Nov 2012 11:22:19 +0000 (12:22 +0100)]
minor code cleanup

11 years agoMerge branch 'master' into bugfix/jogshuttle
Ed Rogalsky [Thu, 22 Nov 2012 10:17:18 +0000 (11:17 +0100)]
Merge branch 'master' into bugfix/jogshuttle

11 years agoFix cut scene action showing up even if motion_est filter is not compiled
Jean-Baptiste Mardelle [Wed, 21 Nov 2012 22:21:45 +0000 (23:21 +0100)]
Fix cut scene action showing up even if motion_est filter is not compiled

11 years agocleanup comments
Ed Rogalsky [Tue, 20 Nov 2012 14:38:20 +0000 (15:38 +0100)]
cleanup comments

11 years agoclean thread shutdown implemented in ShuttleThread
Ed Rogalsky [Tue, 20 Nov 2012 12:34:18 +0000 (13:34 +0100)]
clean thread shutdown implemented in ShuttleThread

11 years agoMerge remote-tracking branch 'origin/master' into bugfix/jogshuttle
Ed Rogalsky [Tue, 20 Nov 2012 09:40:20 +0000 (10:40 +0100)]
Merge remote-tracking branch 'origin/master' into bugfix/jogshuttle

11 years agoFix jogshuttle triggering pause and external wheel not working: http://kdenlive.org...
Jean-Baptiste Mardelle [Mon, 19 Nov 2012 21:47:51 +0000 (22:47 +0100)]
Fix jogshuttle triggering pause and external wheel not working: http://kdenlive.org/mantis/view.php?id=2273

11 years agonumber of buttons expanded to 15. Contour shuttle pro v2 full support
Ed Rogalsky [Mon, 19 Nov 2012 21:12:25 +0000 (22:12 +0100)]
number of buttons expanded to 15. Contour shuttle pro v2 full support

issue: the fd is read in blocking mode. The thread is never shutdown
properly and on some systems the program hangs on close. As workaround
the thread is terminated

11 years agoFix timeline cursor position when opening a project
Jean-Baptiste Mardelle [Mon, 19 Nov 2012 19:24:15 +0000 (20:24 +0100)]
Fix timeline cursor position when opening a project

11 years agoMerge branch 'master' into bugfix/jogshuttle
Ed Rogalsky [Mon, 19 Nov 2012 17:36:22 +0000 (18:36 +0100)]
Merge branch 'master' into bugfix/jogshuttle

11 years agoFix possible crash on invalid filter in clip jobs
Jean-Baptiste Mardelle [Mon, 19 Nov 2012 16:35:41 +0000 (17:35 +0100)]
Fix possible crash on invalid filter in clip jobs

11 years agoCleanup some timeline operations
Jean-Baptiste Mardelle [Mon, 19 Nov 2012 15:53:47 +0000 (16:53 +0100)]
Cleanup some timeline operations

11 years agohotfix for Contour Shuttlexpress button mapping problem
Ed Rogalsky [Sun, 18 Nov 2012 20:02:49 +0000 (21:02 +0100)]
hotfix for Contour Shuttlexpress button mapping problem
http://www.kdenlive.org/mantis/view.php?id=2268

config button count increased to 10. This fix is very static but solves
for now the problem. Will provide in future a more generic and flexible
way.

11 years agoFix crash on project clip deletion
Jean-Baptiste Mardelle [Sat, 17 Nov 2012 22:42:23 +0000 (23:42 +0100)]
Fix crash on project clip deletion

11 years agoFix recent freeze on transition select
Jean-Baptiste Mardelle [Sat, 17 Nov 2012 21:51:24 +0000 (22:51 +0100)]
Fix recent freeze on transition select

11 years agoFix crash on transition select
Jean-Baptiste Mardelle [Sat, 17 Nov 2012 11:18:59 +0000 (12:18 +0100)]
Fix crash on transition select

11 years agoFix right click in timeline: http://kdenlive.org/mantis/view.php?id=2829
Jean-Baptiste Mardelle [Sat, 17 Nov 2012 09:54:56 +0000 (10:54 +0100)]
Fix right click in timeline: http://kdenlive.org/mantis/view.php?id=2829

11 years agoFix rubberband selection one one clip only
Jean-Baptiste Mardelle [Thu, 15 Nov 2012 21:42:12 +0000 (22:42 +0100)]
Fix rubberband selection one one clip only

11 years agoFix broken group move when dragging an empty group zone
Jean-Baptiste Mardelle [Thu, 15 Nov 2012 20:59:03 +0000 (21:59 +0100)]
Fix broken group move when dragging an empty group zone

11 years agoFix crash on wrongly detected document version:
Jean-Baptiste Mardelle [Thu, 15 Nov 2012 20:30:01 +0000 (21:30 +0100)]
Fix crash on wrongly detected document version:
http://kdenlive.org/mantis/view.php?id=2828

11 years agoFix timecode widget sometimes emitting value changed twice causing unnecessary refresh
Jean-Baptiste Mardelle [Wed, 14 Nov 2012 08:30:44 +0000 (09:30 +0100)]
Fix timecode widget sometimes emitting value changed twice causing unnecessary refresh

11 years agoFix open last project opening random file:
Jean-Baptiste Mardelle [Wed, 14 Nov 2012 07:37:46 +0000 (08:37 +0100)]
Fix open last project opening random file:
http://kdenlive.org/mantis/view.php?id=2824

11 years agoRewrite parts of audio thumbnail. We now use square root for better thumbs, now looks...
Jean-Baptiste Mardelle [Mon, 12 Nov 2012 01:19:26 +0000 (02:19 +0100)]
Rewrite parts of audio thumbnail. We now use square root for better thumbs, now looks much more like Audacity, also fix when zooming.

11 years agoFix compilation with Qt 4.6
Jean-Baptiste Mardelle [Mon, 12 Nov 2012 01:03:58 +0000 (02:03 +0100)]
Fix compilation with Qt 4.6

11 years agoMerge branch 'pkey'
Jean-Baptiste Mardelle [Sat, 10 Nov 2012 14:58:59 +0000 (15:58 +0100)]
Merge branch 'pkey'

11 years agoMerge branch 'feature/pkey' of git://anongit.kde.org/kdenlive into pkey
Jean-Baptiste Mardelle [Sat, 10 Nov 2012 14:57:59 +0000 (15:57 +0100)]
Merge branch 'feature/pkey' of git://anongit.kde.org/kdenlive into pkey

11 years agoActivate project monitor before seeking to mouse position
Jean-Baptiste Mardelle [Sat, 10 Nov 2012 14:57:49 +0000 (15:57 +0100)]
Activate project monitor before seeking to mouse position

11 years agoRemove unnecessary screen refresh
Jean-Baptiste Mardelle [Sat, 10 Nov 2012 14:22:21 +0000 (15:22 +0100)]
Remove unnecessary screen refresh

11 years agoNicer light gray background for thumbnail when transparent, remove unnecessary frame...
Jean-Baptiste Mardelle [Sat, 10 Nov 2012 14:09:49 +0000 (15:09 +0100)]
Nicer light gray background for thumbnail when transparent, remove unnecessary frame setting when creating thumbs

11 years agoDo not refresh monitor twice when seeking with left/right arrows
Jean-Baptiste Mardelle [Fri, 9 Nov 2012 20:40:00 +0000 (21:40 +0100)]
Do not refresh monitor twice when seeking with left/right arrows

11 years agoFix small bugs in DVD Wizard transcoding workflow
Jean-Baptiste Mardelle [Fri, 9 Nov 2012 07:42:03 +0000 (08:42 +0100)]
Fix small bugs in DVD Wizard transcoding workflow

11 years agoFix importing clip analysis to effect
Jean-Baptiste Mardelle [Wed, 7 Nov 2012 22:53:03 +0000 (23:53 +0100)]
Fix importing clip analysis to effect

11 years agoWhen saving title, ask to embed image only if there is one
Jean-Baptiste Mardelle [Wed, 7 Nov 2012 21:41:01 +0000 (22:41 +0100)]
When saving title, ask to embed image only if there is one

11 years agoSpeed up automatic scene detection (still very slow but better)
Jean-Baptiste Mardelle [Wed, 7 Nov 2012 21:19:37 +0000 (22:19 +0100)]
Speed up automatic scene detection (still very slow but better)

11 years agoFix thumbnail properties dialog
Jean-Baptiste Mardelle [Tue, 6 Nov 2012 23:02:34 +0000 (00:02 +0100)]
Fix thumbnail properties dialog

11 years agoStart using new MLT format for image sequences
Jean-Baptiste Mardelle [Tue, 6 Nov 2012 22:08:52 +0000 (23:08 +0100)]
Start using new MLT format for image sequences

11 years agoMerge branch 'master' into feature/pkey
Ed Rogalsky [Tue, 6 Nov 2012 16:20:28 +0000 (17:20 +0100)]
Merge branch 'master' into feature/pkey

11 years agoFix bug on transition change undo
Jean-Baptiste Mardelle [Mon, 5 Nov 2012 23:14:29 +0000 (00:14 +0100)]
Fix bug on transition change undo

11 years agoAdd option to remove all keyframes after / before cursor
Jean-Baptiste Mardelle [Mon, 5 Nov 2012 21:35:30 +0000 (22:35 +0100)]
Add option to remove all keyframes after / before cursor

11 years agoAllow to explicitely store cut scenes as metadata
Jean-Baptiste Mardelle [Mon, 5 Nov 2012 11:02:39 +0000 (12:02 +0100)]
Allow to explicitely store cut scenes as metadata

11 years agoAllow to analyse only a zone of a clip
Jean-Baptiste Mardelle [Mon, 5 Nov 2012 10:58:06 +0000 (11:58 +0100)]
Allow to analyse only a zone of a clip

11 years agoMerge branch 'master' into feature/pkey
Ed Rogalsky [Mon, 5 Nov 2012 06:44:39 +0000 (07:44 +0100)]
Merge branch 'master' into feature/pkey

11 years agoManage clip crop start when importing geometry keyframes from a clip
Jean-Baptiste Mardelle [Mon, 5 Nov 2012 00:26:48 +0000 (01:26 +0100)]
Manage clip crop start when importing geometry keyframes from a clip

11 years agoFix bug in previous commit
Jean-Baptiste Mardelle [Sun, 4 Nov 2012 23:47:36 +0000 (00:47 +0100)]
Fix bug in previous commit

11 years agoImprove update of effect stack when resizing clip, start implementing merge of analys...
Jean-Baptiste Mardelle [Sun, 4 Nov 2012 23:30:22 +0000 (00:30 +0100)]
Improve update of effect stack when resizing clip, start implementing merge of analysis data

11 years agoSmall fixes to clip job progress bar
Jean-Baptiste Mardelle [Sun, 4 Nov 2012 16:01:43 +0000 (17:01 +0100)]
Small fixes to clip job progress bar

11 years agoFix titlewidget rectangle border alpha value not correctly restored
Jean-Baptiste Mardelle [Sun, 4 Nov 2012 12:27:56 +0000 (13:27 +0100)]
Fix titlewidget rectangle border alpha value not correctly restored

11 years agoMerge branch 'master' into feature/pkey
Ed Rogalsky [Sat, 3 Nov 2012 17:53:21 +0000 (18:53 +0100)]
Merge branch 'master' into feature/pkey

11 years agoAllow feedback message for clip jobs
Jean-Baptiste Mardelle [Sat, 3 Nov 2012 15:24:47 +0000 (16:24 +0100)]
Allow feedback message for clip jobs

11 years agoImplement analysis load / save
Jean-Baptiste Mardelle [Sat, 3 Nov 2012 14:12:59 +0000 (15:12 +0100)]
Implement analysis load / save

11 years agoFix loading of dvd project file intro movie
Jean-Baptiste Mardelle [Fri, 2 Nov 2012 18:48:05 +0000 (19:48 +0100)]
Fix loading of dvd project file intro movie

11 years agoFix typo
Jean-Baptiste Mardelle [Fri, 2 Nov 2012 18:36:00 +0000 (19:36 +0100)]
Fix typo

11 years agoFix intro movie in dvd wizard
Jean-Baptiste Mardelle [Fri, 2 Nov 2012 18:25:36 +0000 (19:25 +0100)]
Fix intro movie in dvd wizard

11 years agoFinal changes to the DVD wizard rewrite. Allow transcoding of non compliant files...
Jean-Baptiste Mardelle [Fri, 2 Nov 2012 00:30:15 +0000 (01:30 +0100)]
Final changes to the DVD wizard rewrite. Allow transcoding of non compliant files, allow drag & drop clips into DVD wizard

11 years agoRewrote DVD creation, should now support correctly 4:3 and 16:9 menus, letterbox...
Jean-Baptiste Mardelle [Wed, 31 Oct 2012 22:38:48 +0000 (23:38 +0100)]
Rewrote DVD creation, should now support correctly 4:3 and 16:9 menus, letterbox is still untested (playing 16:9 on 4:3 monitor)

11 years agoAuto detect DVD format when inserting clip in DVD wizard
Jean-Baptiste Mardelle [Wed, 31 Oct 2012 10:35:17 +0000 (11:35 +0100)]
Auto detect DVD format when inserting clip in DVD wizard

11 years agoMerge branch 'master' into feature/pkey
Ed Rogalsky [Wed, 31 Oct 2012 06:56:55 +0000 (07:56 +0100)]
Merge branch 'master' into feature/pkey

Conflicts:
src/mainwindow.h

11 years agoSeveral improvements in DVD wizard, fix menu with background movie (currently only...
Jean-Baptiste Mardelle [Wed, 31 Oct 2012 00:12:59 +0000 (01:12 +0100)]
Several improvements in DVD wizard, fix menu with background movie (currently only works for 4:3 ratio)

11 years agoFix possible crash in geom widget
Jean-Baptiste Mardelle [Tue, 30 Oct 2012 14:43:01 +0000 (15:43 +0100)]
Fix possible crash in geom widget

11 years agoMinor improvements to keyframe widget, allow resetting keyframes
Jean-Baptiste Mardelle [Tue, 30 Oct 2012 14:25:33 +0000 (15:25 +0100)]
Minor improvements to keyframe widget, allow resetting keyframes

11 years agosmall fixes when changing tools in timeline
Jean-Baptiste Mardelle [Tue, 30 Oct 2012 10:20:22 +0000 (11:20 +0100)]
small fixes when changing tools in timeline

11 years agoBetter fix for select all in timeline
Jean-Baptiste Mardelle [Tue, 30 Oct 2012 09:46:25 +0000 (10:46 +0100)]
Better fix for select all in timeline

11 years agoFix select all in timeline and scrolling with ctrl+click:http://kdenlive.org/mantis...
Jean-Baptiste Mardelle [Tue, 30 Oct 2012 09:36:45 +0000 (10:36 +0100)]
Fix select all in timeline and scrolling with ctrl+click:http://kdenlive.org/mantis/view.php?id=2791

11 years agoMerge branch 'master' into feature/pkey
Ed Rogalsky [Tue, 30 Oct 2012 07:05:15 +0000 (08:05 +0100)]
Merge branch 'master' into feature/pkey