hudson [Wed, 14 Dec 2011 11:34:16 +0000 (20:34 +0900)]
Merge branch 'master' into release
yeongkyoon lee [Wed, 14 Dec 2011 11:14:59 +0000 (20:14 +0900)]
Merge "[Title] Modified emulator to be started by script [Type] Feature/BugFix/Enahncement [Module] build.sh, configuration.c [Priority] [CQ#] [Redmine#] [Problem] It's difficult to debug qemu & kernel [Cause] [Solution] Enabled script type launching style [TestCase]"
hudson [Wed, 14 Dec 2011 10:03:37 +0000 (19:03 +0900)]
Merge branch 'master' into release
munkyu.im [Wed, 14 Dec 2011 09:52:18 +0000 (18:52 +0900)]
[Title]fix max length
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Wed, 14 Dec 2011 07:14:16 +0000 (16:14 +0900)]
Merge branch 'master' into release
munkyu.im [Wed, 14 Dec 2011 07:13:41 +0000 (16:13 +0900)]
[Title]Remove help list and sound option
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Wed, 14 Dec 2011 05:54:05 +0000 (14:54 +0900)]
Merge branch 'master' into release
yeongkyoon lee [Wed, 14 Dec 2011 05:43:12 +0000 (14:43 +0900)]
Merge "[Title] remove making arm default image [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
munkyu.im [Wed, 14 Dec 2011 05:44:07 +0000 (14:44 +0900)]
[Title] remove making arm default image
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Wed, 14 Dec 2011 05:39:02 +0000 (14:39 +0900)]
Merge branch 'master' into release
giwoong.kim [Wed, 14 Dec 2011 04:58:03 +0000 (13:58 +0900)]
[Title] print gtk & sdl version info
[Type] log
[Module] Emulator
[Priority] minor
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase] emulator.log
hudson [Wed, 14 Dec 2011 03:14:56 +0000 (12:14 +0900)]
Merge branch 'master' into release
munkyu.im [Wed, 14 Dec 2011 03:11:03 +0000 (12:11 +0900)]
[Title]add intensive kvm ckecking module
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Wed, 14 Dec 2011 01:39:12 +0000 (10:39 +0900)]
Merge branch 'master' into release
munkyu.im [Tue, 13 Dec 2011 13:05:00 +0000 (22:05 +0900)]
[Title]add newline
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
munkyu.im [Tue, 13 Dec 2011 12:46:23 +0000 (21:46 +0900)]
[Title]apply arm supporting of emulator manager
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
Conflicts:
tizen/src/vtm.c
Jo Jinhyung [Tue, 13 Dec 2011 04:08:09 +0000 (13:08 +0900)]
[Title] Fix bug : setting(getting) up the camera control values.
[Type] Bug fix
[Module] Emulator/Camera
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
yeongkyoon lee [Tue, 13 Dec 2011 12:34:11 +0000 (21:34 +0900)]
Merge "[Title] Remove target, disk option of emulator [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
yeongkyoon lee [Tue, 13 Dec 2011 12:27:47 +0000 (21:27 +0900)]
Merge "[Title]Rollback to dff7e (2) [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
munkyu.im [Tue, 13 Dec 2011 12:29:33 +0000 (21:29 +0900)]
[Title]Rollback to dff7e (2)
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
munkyu.im [Tue, 13 Dec 2011 03:47:15 +0000 (12:47 +0900)]
[Title] Remove target, disk option of emulator
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
munkyu.im [Tue, 13 Dec 2011 12:24:30 +0000 (21:24 +0900)]
[Title]Rollback to dff7e
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
munkyu.im [Tue, 13 Dec 2011 12:10:32 +0000 (21:10 +0900)]
[Title]apply arm supporting of emulator manager
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Tue, 13 Dec 2011 07:55:14 +0000 (16:55 +0900)]
Merge branch 'master' into release
dk77.yun [Tue, 13 Dec 2011 07:54:16 +0000 (16:54 +0900)]
Merge "[Title] Fix bug : setting(getting) up the camera control values. [Type] Bug fix [Module] Emulator/Camera [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
hudson [Tue, 13 Dec 2011 05:57:21 +0000 (14:57 +0900)]
Merge branch 'master' into release
yeongkyoon lee [Tue, 13 Dec 2011 05:47:40 +0000 (14:47 +0900)]
Merge "[Title]remove disk option in emulator manager [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
munkyu.im [Tue, 13 Dec 2011 05:46:15 +0000 (14:46 +0900)]
[Title]remove disk option in emulator manager
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Tue, 13 Dec 2011 04:35:23 +0000 (13:35 +0900)]
Merge branch 'master' into release
munkyu.im [Tue, 13 Dec 2011 03:47:15 +0000 (12:47 +0900)]
[Title] Remove target, disk option of emulator
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
yeongkyoon lee [Tue, 13 Dec 2011 04:20:07 +0000 (13:20 +0900)]
Merge "[Title] Remove target, disk option of emulator [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
Jo Jinhyung [Tue, 13 Dec 2011 04:08:09 +0000 (13:08 +0900)]
[Title] Fix bug : setting(getting) up the camera control values.
[Type] Bug fix
[Module] Emulator/Camera
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
munkyu.im [Tue, 13 Dec 2011 03:47:15 +0000 (12:47 +0900)]
[Title] Remove target, disk option of emulator
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Tue, 13 Dec 2011 01:45:39 +0000 (10:45 +0900)]
Merge branch 'master' into release
kt920.kim [Tue, 13 Dec 2011 01:06:22 +0000 (10:06 +0900)]
[Title] Modify TRACE LOG
[Type] Bug fix
[Module] Codec
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
kt920.kim [Mon, 12 Dec 2011 15:04:01 +0000 (00:04 +0900)]
[Title] Solved the problem codec module does not work.
[Type] Bug fix
[Module] Enhancement
[Priority]
[CQ#]
[Redmine#]
[Problem]
AVCodecContext struct has been updated in the guest.
[Cause]
[Solution]
Update AVCodecContext struct in the kernel and qemu.
[TestCase]
hudson [Mon, 12 Dec 2011 12:44:57 +0000 (21:44 +0900)]
Merge branch 'master' into release
munkyu.im [Mon, 12 Dec 2011 12:29:20 +0000 (21:29 +0900)]
[Title] seperate arm from x86
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
munkyu.im [Mon, 12 Dec 2011 12:29:20 +0000 (21:29 +0900)]
[Title] seperate arm from x86
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Mon, 12 Dec 2011 11:23:50 +0000 (20:23 +0900)]
Merge branch 'master' into release
giwoong.kim [Mon, 12 Dec 2011 10:47:43 +0000 (19:47 +0900)]
[Title] fixed half emulator window problem
[Type] Bugfix
[Module] Emulator / skin
[Priority] major
[CQ#] n/a
[Redmine#] n/a
[Problem] half window in ubuntu 10.10
[Cause] maybe gtk bug
[Solution]
[TestCase] rotation/resizing
hudson [Mon, 12 Dec 2011 07:50:06 +0000 (16:50 +0900)]
Merge branch 'master' into release
jinseok86.kim [Mon, 12 Dec 2011 07:15:29 +0000 (16:15 +0900)]
[Title] Incorrectly merged file edited.
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution] emulator-x86, emulator-arm installed to bin/
[TestCase]
jinseok86.kim [Mon, 12 Dec 2011 06:55:02 +0000 (15:55 +0900)]
[Title] arm_emulator branch merged into master
[Type] Support
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
Skin HW Button is disabled due to multiple keyboard support. (Needs re-implementation)
munkyu.im [Mon, 12 Dec 2011 05:45:28 +0000 (14:45 +0900)]
[Title] Fix screen shot image size problem
[Type]Bugfix
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Sat, 10 Dec 2011 12:14:47 +0000 (21:14 +0900)]
Merge branch 'master' into release
munkyu.im [Sat, 10 Dec 2011 08:13:01 +0000 (17:13 +0900)]
[Title]Fix alpahbet to Upper case
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Sat, 10 Dec 2011 08:03:44 +0000 (17:03 +0900)]
Merge branch 'master' into release
munkyu.im [Sat, 10 Dec 2011 07:42:26 +0000 (16:42 +0900)]
[Title]fix Ram to RAM and some minor problem
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Sat, 10 Dec 2011 06:12:32 +0000 (15:12 +0900)]
Merge branch 'master' into release
munkyu.im [Sat, 10 Dec 2011 05:54:51 +0000 (14:54 +0900)]
[Title] Remove samsung copyright
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Sat, 10 Dec 2011 05:32:09 +0000 (14:32 +0900)]
Merge branch 'master' into release
munkyu.im [Sat, 10 Dec 2011 05:16:41 +0000 (14:16 +0900)]
[Title]Change version name
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Sat, 10 Dec 2011 03:33:13 +0000 (12:33 +0900)]
Merge branch 'master' into release
munkyu.im [Sat, 10 Dec 2011 03:27:26 +0000 (12:27 +0900)]
[Title] add sized dialog message
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
yeongkyoon lee [Sat, 10 Dec 2011 03:20:43 +0000 (12:20 +0900)]
Merge "[Title] fix that to set(get) a different values for camera controls [Type] Bugfix [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
yeongkyoon lee [Sat, 10 Dec 2011 03:14:45 +0000 (12:14 +0900)]
Merge "[Title]set dialog not to resize [Type]Enhancement [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
munkyu.im [Fri, 9 Dec 2011 14:38:26 +0000 (23:38 +0900)]
[Title]set dialog not to resize
[Type]Enhancement
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Fri, 9 Dec 2011 13:44:15 +0000 (22:44 +0900)]
Merge branch 'master' into release
Jo Jinhyung [Fri, 9 Dec 2011 13:39:55 +0000 (22:39 +0900)]
[Title] fix that to set(get) a different values for camera controls
[Type] Bugfix
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
yeongkyoon lee [Fri, 9 Dec 2011 13:28:05 +0000 (22:28 +0900)]
Merge "[Title] remove rpath [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
munkyu.im [Fri, 9 Dec 2011 13:11:16 +0000 (22:11 +0900)]
[Title] remove rpath
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Fri, 9 Dec 2011 13:03:45 +0000 (22:03 +0900)]
Merge branch 'master' into release
hj79.son [Fri, 9 Dec 2011 12:46:36 +0000 (21:46 +0900)]
[Title] fix a problem that video play starts with an previous after image.
[Type] Bugfix
[Module] Emulator / Display
[Priority] Minor
[CQ#]
[Redmine#] 3780
[Problem]
[Cause] overlay device does not clear it's area after power off.
[Solution] clear the disabled overlay area.
hj79.son [Fri, 9 Dec 2011 12:36:34 +0000 (21:36 +0900)]
[Title] fix a problem that video play starts with an previous after image.
[Type] Bugfix
[Module] Emulator / Display
[Priority] Minor
[CQ#]
[Redmine#] 3780
[Problem]
[Cause] overlay device does not clear it's area after power off.
[Solution] clear the disabled overlay area.
hudson [Fri, 9 Dec 2011 12:03:39 +0000 (21:03 +0900)]
Merge branch 'master' into release
munkyu.im [Fri, 9 Dec 2011 11:55:25 +0000 (20:55 +0900)]
[Title]apply qemu log redirection to logfile and fix sdcard path error
[Type]Enhancement, Bugfix
[Module]
[Priority]
[CQ#]
[Redmine#]#3788
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Fri, 9 Dec 2011 11:23:43 +0000 (20:23 +0900)]
Merge branch 'master' into release
Jo Jinhyung [Fri, 9 Dec 2011 11:02:03 +0000 (20:02 +0900)]
[Title] edited logs
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
don.hong [Fri, 9 Dec 2011 08:29:24 +0000 (17:29 +0900)]
[Title] Modified emulator to be started by script
[Type] Feature/BugFix/Enahncement
[Module] build.sh, configuration.c
[Priority]
[CQ#]
[Redmine#]
[Problem] It's difficult to debug qemu & kernel
[Cause]
[Solution] Enabled script type launching style
[TestCase]
hudson [Fri, 9 Dec 2011 07:33:18 +0000 (16:33 +0900)]
Merge branch 'master' into release
Jo Jinhyung [Fri, 9 Dec 2011 07:20:22 +0000 (16:20 +0900)]
[Title] bug fix for interrupt
[Type] Bug fix
[Module] Emulator / camera
[Priority]
[CQ#]
[Redmine#]
[Problem] Host webcam image frames does not go to guest.
[Cause] Device does not interrupt the normal.
[Solution] Match PCI interrupt pin # & raise interrupt #
[TestCase]
hudson [Fri, 9 Dec 2011 04:31:56 +0000 (13:31 +0900)]
Merge branch 'master' into release
yeongkyoon lee [Fri, 9 Dec 2011 04:30:58 +0000 (13:30 +0900)]
Merge "[Title] Improve multitouch usability [Type] Feature [Module] Emulator / touch [Priority] minor [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] drag previous fingerpoint during multitouching"
yeongkyoon lee [Fri, 9 Dec 2011 04:30:32 +0000 (13:30 +0900)]
Merge "[Title] apply vtm glade file for resolution combo box [Type]Enhancement [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
yeongkyoon lee [Fri, 9 Dec 2011 04:30:24 +0000 (13:30 +0900)]
Merge "[Title]change resolution menu from radio button to combobox. [Type]Enhancement [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
giwoong.kim [Fri, 9 Dec 2011 02:28:56 +0000 (11:28 +0900)]
[Title] Improve multitouch usability
[Type] Feature
[Module] Emulator / touch
[Priority] minor
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase] drag previous fingerpoint during multitouching
munkyu.im [Thu, 8 Dec 2011 14:45:55 +0000 (23:45 +0900)]
[Title] apply vtm glade file for resolution combo box
[Type]Enhancement
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
munkyu.im [Thu, 8 Dec 2011 14:43:22 +0000 (23:43 +0900)]
[Title]change resolution menu from radio button to combobox.
[Type]Enhancement
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Thu, 8 Dec 2011 12:11:45 +0000 (21:11 +0900)]
Merge branch 'master' into release
kt920.kim [Thu, 8 Dec 2011 12:02:55 +0000 (21:02 +0900)]
[Title] Change license type of tizen-codec source and remove make option.
[Type] bug fix
[Module] build
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Thu, 8 Dec 2011 11:22:50 +0000 (20:22 +0900)]
Merge branch 'master' into release
yeongkyoon lee [Thu, 8 Dec 2011 11:22:32 +0000 (20:22 +0900)]
Merge "[Title] Add some libraries which are dependent with ffmpeg static library. [Type] bug fix [Module] codec & qemu build [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
hudson [Thu, 8 Dec 2011 11:12:28 +0000 (20:12 +0900)]
Merge branch 'master' into release
dk77.yun [Thu, 8 Dec 2011 11:09:02 +0000 (20:09 +0900)]
Merge "[Title] Add callback to reset button and change warning mwssage [Type]Bugfix [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
hudson [Thu, 8 Dec 2011 10:51:30 +0000 (19:51 +0900)]
Merge branch 'master' into release
dongkyun.yun [Thu, 8 Dec 2011 10:45:25 +0000 (19:45 +0900)]
[Title] comment out log messages
[Type] // Commit Type: Feature / Bugfix / Enhancement
[Module] // Module Name - (Main / Sub)
[Priority] // Importance : Critical / Major / Minor
[CQ#] // CQ Issue Number
[Redmine#] // Redmine Isuue Number
[Problem] // Problem Description
[Cause] // Cause Description
[Solution] // Solution Description
[TestCase] // Executed the test-target (How to)
munkyu.im [Thu, 8 Dec 2011 10:40:18 +0000 (19:40 +0900)]
[Title] Add callback to reset button and change warning mwssage
[Type]Bugfix
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
kt920.kim [Thu, 8 Dec 2011 10:20:52 +0000 (19:20 +0900)]
[Title] Add some libraries which are dependent with ffmpeg static library.
[Type] bug fix
[Module] codec & qemu build
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Thu, 8 Dec 2011 09:11:49 +0000 (18:11 +0900)]
Merge branch 'master' into release
dongkyun.yun [Thu, 8 Dec 2011 08:55:38 +0000 (17:55 +0900)]
[Title] Update for build fail
[Type] Bugfix
[Module] // Module Name - (Main / Sub)
[Priority] // Importance : Critical / Major / Minor
[CQ#] // CQ Issue Number
[Redmine#] // Redmine Isuue Number
[Problem] // Problem Description
[Cause] // Cause Description
[Solution] // Solution Description
[TestCase] // Executed the test-target (How to)
hudson [Thu, 8 Dec 2011 08:53:37 +0000 (17:53 +0900)]
Merge branch 'master' into release
yeongkyoon lee [Thu, 8 Dec 2011 08:41:10 +0000 (17:41 +0900)]
Merge "[Title]Add reset button [Type]Enhancement [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]"
hudson [Thu, 8 Dec 2011 07:49:55 +0000 (16:49 +0900)]
Merge branch 'master' into release
kt920.kim [Thu, 8 Dec 2011 07:47:40 +0000 (16:47 +0900)]
[Title] add disable-ffmpeg option to build qemu.
[Type] bug fix
[Module] emulator / build
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Thu, 8 Dec 2011 07:08:56 +0000 (16:08 +0900)]
Merge branch 'master' into release
dk77.yun [Thu, 8 Dec 2011 07:04:23 +0000 (16:04 +0900)]
Merge "[Title] link ffmpeg static library and add configure check routine for v4l2 library and headers. [Type] Enhancement [Module] Codec & build script [Priority] [CQ#] [Redmine#] [Problem] 1. dynamic library may cause error. 2. when qemu build without v4l2 library and headers, configure script display wrong messages. For example, qemu's build error message is about zlib even if there is no v4l2 headers and libraries. [Cause] [Solution] Add check routine for v4l2 library and headers. In addition to this, enable or disable-v4l2 configure option can use from now. [TestCase]"
Jo Jinhyung [Thu, 8 Dec 2011 07:01:10 +0000 (16:01 +0900)]
[Title] camera module move & init camera module
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
munkyu.im [Thu, 8 Dec 2011 06:21:41 +0000 (15:21 +0900)]
[Title]Add reset button
[Type]Enhancement
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
hudson [Thu, 8 Dec 2011 05:54:14 +0000 (14:54 +0900)]
Merge branch 'master' into release