platform/upstream/opencv.git
9 years agoMerge pull request #3695 from SpecLad:fix-hdc-tautology
Roman Donchenko [Fri, 13 Feb 2015 14:09:07 +0000 (14:09 +0000)]
Merge pull request #3695 from SpecLad:fix-hdc-tautology

9 years agoMerge pull request #3693 from SpecLad:no-absolute-destinations
Roman Donchenko [Fri, 13 Feb 2015 14:06:54 +0000 (14:06 +0000)]
Merge pull request #3693 from SpecLad:no-absolute-destinations

9 years agoDon't install documentation if it isn't built
Roman Donchenko [Thu, 12 Feb 2015 13:51:26 +0000 (16:51 +0300)]
Don't install documentation if it isn't built

The HAVE_DOC_GENERATOR variable was always true.

9 years agoDon't use ${CMAKE_INSTALL_PREFIX} as an install destination
Roman Donchenko [Tue, 10 Feb 2015 16:43:29 +0000 (19:43 +0300)]
Don't use ${CMAKE_INSTALL_PREFIX} as an install destination

Absolute destinations are not necessary, and prevent CPack from working.

9 years agoMerge pull request #3689 from jet47:test-script-optional-color-2.4
Vadim Pisarevsky [Tue, 10 Feb 2015 12:00:44 +0000 (12:00 +0000)]
Merge pull request #3689 from jet47:test-script-optional-color-2.4

9 years agomake color output in run_test script optional
Vladislav Vinogradov [Mon, 9 Feb 2015 12:23:34 +0000 (15:23 +0300)]
make color output in run_test script optional

9 years agoMerge pull request #3680 from jet47:fix-run-tests-script-2.4
Vadim Pisarevsky [Sun, 8 Feb 2015 17:07:10 +0000 (17:07 +0000)]
Merge pull request #3680 from jet47:fix-run-tests-script-2.4

9 years agofix opencv_run_all_tests_unix.sh script:
Vladislav Vinogradov [Fri, 6 Feb 2015 09:34:50 +0000 (12:34 +0300)]
fix opencv_run_all_tests_unix.sh script:

use `bash` shell instead of `sh`, since on Ubuntu `sh` by default is `dash`,
and `dash` doesn't support `PIPESTATUS` feature used in this sctipt

9 years agoMerge pull request #3667 from AfterEight:cap_ximea_setResolution_bugfix
Vadim Pisarevsky [Thu, 5 Feb 2015 07:48:43 +0000 (07:48 +0000)]
Merge pull request #3667 from AfterEight:cap_ximea_setResolution_bugfix

9 years agoMerge pull request #3674 from jet47:colorize-run-test-script-2.4
Vadim Pisarevsky [Thu, 5 Feb 2015 07:35:01 +0000 (07:35 +0000)]
Merge pull request #3674 from jet47:colorize-run-test-script-2.4

9 years agoMerge pull request #3676 from asmorkalov:changelog_for_tests
Vadim Pisarevsky [Wed, 4 Feb 2015 15:13:44 +0000 (15:13 +0000)]
Merge pull request #3676 from asmorkalov:changelog_for_tests

9 years agoAdded Debian changelog to -tests package.
Alexander Smorkalov [Wed, 4 Feb 2015 13:52:39 +0000 (16:52 +0300)]
Added Debian changelog to -tests package.

9 years agoMerge pull request #3672 from asmorkalov:debian_lower_case
Vadim Pisarevsky [Wed, 4 Feb 2015 13:17:51 +0000 (13:17 +0000)]
Merge pull request #3672 from asmorkalov:debian_lower_case

9 years agoMerge pull request #3671 from jet47:disable-gpu-match-template-tests
Vadim Pisarevsky [Wed, 4 Feb 2015 13:17:25 +0000 (13:17 +0000)]
Merge pull request #3671 from jet47:disable-gpu-match-template-tests

9 years agocolorize opencv_run_all_tests_unix.sh script output
Vladislav Vinogradov [Wed, 4 Feb 2015 09:38:51 +0000 (12:38 +0300)]
colorize opencv_run_all_tests_unix.sh script output

9 years agoDebian package names replaced by lower case version to satisfy lintian.
Alexander Smorkalov [Wed, 4 Feb 2015 08:37:52 +0000 (11:37 +0300)]
Debian package names replaced by lower case version to satisfy lintian.

9 years agodisable gpu::matchTemplate tests
Vladislav Vinogradov [Wed, 4 Feb 2015 08:21:17 +0000 (11:21 +0300)]
disable gpu::matchTemplate tests

9 years agoModified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated...
AfterEight [Mon, 2 Feb 2015 13:59:52 +0000 (14:59 +0100)]
Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value)

9 years agoMerge pull request #3662 from StevenPuttemans:fix_models
Vadim Pisarevsky [Mon, 2 Feb 2015 10:17:43 +0000 (10:17 +0000)]
Merge pull request #3662 from StevenPuttemans:fix_models

9 years agofixing wrong model sizes
StevenPuttemans [Sun, 1 Feb 2015 14:13:57 +0000 (15:13 +0100)]
fixing wrong model sizes

9 years agoMerge pull request #3660 from asmorkalov:samples_install_permissions
Vadim Pisarevsky [Sun, 1 Feb 2015 09:14:28 +0000 (09:14 +0000)]
Merge pull request #3660 from asmorkalov:samples_install_permissions

9 years agoFixed samples install permissions for Debian packaging.
Alexander Smorkalov [Sat, 31 Jan 2015 21:34:23 +0000 (00:34 +0300)]
Fixed samples install permissions for Debian packaging.

9 years agoMerge pull request #3655 from asmorkalov:remove_opencv_testing_sh
Vadim Pisarevsky [Sat, 31 Jan 2015 14:46:40 +0000 (14:46 +0000)]
Merge pull request #3655 from asmorkalov:remove_opencv_testing_sh

9 years agoMerge pull request #3658 from asmorkalov:numpy_dependency
Vadim Pisarevsky [Sat, 31 Jan 2015 14:45:11 +0000 (14:45 +0000)]
Merge pull request #3658 from asmorkalov:numpy_dependency

9 years agoMerge pull request #3659 from asmorkalov:debian_changelog_stub
Vadim Pisarevsky [Sat, 31 Jan 2015 14:44:41 +0000 (14:44 +0000)]
Merge pull request #3659 from asmorkalov:debian_changelog_stub

9 years agoAdded Debian changelog installation step for Debian package generation.
Alexander Smorkalov [Fri, 30 Jan 2015 10:21:52 +0000 (13:21 +0300)]
Added Debian changelog installation step for Debian package generation.

9 years agoAdded dependency from numpy to debian package with python bindings.
Alexander Smorkalov [Fri, 30 Jan 2015 09:26:08 +0000 (12:26 +0300)]
Added dependency from numpy to debian package with python bindings.

9 years agoopencv_testing.sh script installation is removed as run tests script does the same...
Alexander Smorkalov [Thu, 29 Jan 2015 16:20:18 +0000 (19:20 +0300)]
opencv_testing.sh script installation is removed as run tests script does the same thing.

9 years agoMerge pull request #3649 from StevenPuttemans:fix_tutorials
Vadim Pisarevsky [Thu, 29 Jan 2015 12:14:09 +0000 (12:14 +0000)]
Merge pull request #3649 from StevenPuttemans:fix_tutorials

9 years agoMerge pull request #3587 from vpradeep07:fix/pnpransac_race_cond
Vadim Pisarevsky [Thu, 29 Jan 2015 12:12:18 +0000 (12:12 +0000)]
Merge pull request #3587 from vpradeep07:fix/pnpransac_race_cond

9 years agoMerge pull request #3648 from SpecLad:get_policy-ts
Vadim Pisarevsky [Wed, 28 Jan 2015 18:49:58 +0000 (18:49 +0000)]
Merge pull request #3648 from SpecLad:get_policy-ts

9 years agofixing tutorial errors
StevenPuttemans [Wed, 28 Jan 2015 12:52:50 +0000 (13:52 +0100)]
fixing tutorial errors

9 years agoFixed getPolicy() method to make it thread-safe.
Alexander Karsakov [Thu, 13 Mar 2014 06:22:36 +0000 (10:22 +0400)]
Fixed getPolicy() method to make it thread-safe.

(cherry picked from commit 8910508b838363ce4f721e5b463cd04cfd225a1a)

9 years agoMerge pull request #3641 from cbenhagen:patch-2
Vadim Pisarevsky [Mon, 26 Jan 2015 09:45:59 +0000 (09:45 +0000)]
Merge pull request #3641 from cbenhagen:patch-2

9 years agoDo not blacklist GStreamer on Apple
Ben Hagen [Fri, 23 Jan 2015 11:59:09 +0000 (12:59 +0100)]
Do not blacklist GStreamer on Apple

9 years agoMerge pull request #3631 from StevenPuttemans:fix_samples
Vadim Pisarevsky [Wed, 21 Jan 2015 10:40:19 +0000 (10:40 +0000)]
Merge pull request #3631 from StevenPuttemans:fix_samples

9 years agoMerge pull request #3468 from StevenPuttemans:fix_models
Vadim Pisarevsky [Tue, 20 Jan 2015 15:25:50 +0000 (15:25 +0000)]
Merge pull request #3468 from StevenPuttemans:fix_models

9 years agoremove an unused #endif
StevenPuttemans [Tue, 20 Jan 2015 14:41:39 +0000 (15:41 +0100)]
remove an unused #endif

9 years agoMerge pull request #3613 from asmorkalov:aarch64_tiff
Vadim Pisarevsky [Tue, 20 Jan 2015 12:36:38 +0000 (12:36 +0000)]
Merge pull request #3613 from asmorkalov:aarch64_tiff

9 years agoMerge pull request #3609 from jet47:fix-ocv_add_module-2.4
Vadim Pisarevsky [Tue, 20 Jan 2015 12:34:49 +0000 (12:34 +0000)]
Merge pull request #3609 from jet47:fix-ocv_add_module-2.4

9 years agoMerge pull request #3621 from asmorkalov:ts_master_comapat_header
Vadim Pisarevsky [Mon, 19 Jan 2015 12:33:58 +0000 (12:33 +0000)]
Merge pull request #3621 from asmorkalov:ts_master_comapat_header

9 years agoMerge pull request #3623 from Trundle:fix_android_link
Vadim Pisarevsky [Mon, 19 Jan 2015 10:51:12 +0000 (10:51 +0000)]
Merge pull request #3623 from Trundle:fix_android_link

9 years agoMerge pull request #3614 from cwreynolds:Unicode-fix-for-addText-2
Vadim Pisarevsky [Mon, 19 Jan 2015 10:50:14 +0000 (10:50 +0000)]
Merge pull request #3614 from cwreynolds:Unicode-fix-for-addText-2

9 years agoUpdate link to information about Android platform.
Andreas Stührk [Sun, 18 Jan 2015 23:01:12 +0000 (00:01 +0100)]
Update link to information about Android platform.

The current link does no longer seem to work.

9 years agoAdded OpenCV 3.0 compat header for TS module.
Alexander Smorkalov [Sun, 18 Jan 2015 18:27:47 +0000 (21:27 +0300)]
Added OpenCV 3.0 compat header for TS module.

9 years agoMerge pull request #3620 from asmorkalov:native_samples_install
Vadim Pisarevsky [Sun, 18 Jan 2015 18:22:27 +0000 (18:22 +0000)]
Merge pull request #3620 from asmorkalov:native_samples_install

9 years agoPrevent native c/c++/ocl/gpu CMakeLists.txt install if samples are turned off.
Alexander Smorkalov [Sun, 18 Jan 2015 17:33:05 +0000 (20:33 +0300)]
Prevent native c/c++/ocl/gpu CMakeLists.txt install if samples are turned off.

9 years agoIn cvAddText, construct QString from "text" using fromUtf8.
Craig Reynolds [Fri, 16 Jan 2015 22:57:11 +0000 (14:57 -0800)]
In cvAddText, construct QString from "text" using fromUtf8.

9 years agoTIFF support hack for aarch64 reverted.
Alexander Smorkalov [Fri, 16 Jan 2015 22:25:58 +0000 (01:25 +0300)]
TIFF support hack for aarch64 reverted.

9 years agoMerge pull request #3604 from asmorkalov:ocv_samples_package
Vadim Pisarevsky [Fri, 16 Jan 2015 10:23:32 +0000 (10:23 +0000)]
Merge pull request #3604 from asmorkalov:ocv_samples_package

9 years agofix ocv_add_module CMake macro:
Vladislav Vinogradov [Fri, 16 Jan 2015 07:59:52 +0000 (10:59 +0300)]
fix ocv_add_module CMake macro:

it tries to remove 'opencv_' prefix from 'name' variable, but
it creates new variable with the same name as module

9 years agoFixed -samples debian package dependencies.
Alexander Smorkalov [Thu, 15 Jan 2015 12:36:45 +0000 (15:36 +0300)]
Fixed -samples debian package dependencies.

9 years agoFixed installation of CMakeLists.txt and enabled GPU samples build in stand alone...
Alexander Smorkalov [Thu, 15 Jan 2015 11:48:24 +0000 (14:48 +0300)]
Fixed installation of CMakeLists.txt and enabled GPU samples build in stand alone version.

9 years agoGPU samples with NVIDIA specific API excluded from build if CUDA disabled.
Alexander Smorkalov [Tue, 13 Jan 2015 11:39:56 +0000 (14:39 +0300)]
GPU samples with NVIDIA specific API excluded from build if CUDA disabled.

9 years agoBuild fixes for GPU samples.
Alexander Smorkalov [Tue, 13 Jan 2015 10:22:41 +0000 (13:22 +0300)]
Build fixes for GPU samples.

9 years agoMerge pull request #3310 from tSed:opencv-2.4/fix-gstreamer-detection
Vadim Pisarevsky [Tue, 13 Jan 2015 11:25:32 +0000 (11:25 +0000)]
Merge pull request #3310 from tSed:opencv-2.4/fix-gstreamer-detection

9 years agodriver_api_stereo_multi sample reworked to use parallel_for_ instead of parallel_do
Alexander Smorkalov [Tue, 13 Jan 2015 10:00:06 +0000 (13:00 +0300)]
driver_api_stereo_multi sample reworked to use parallel_for_ instead of parallel_do

9 years agoparallel_do replaced with parallel_for_ in driver_gpu_multi sample.
Alexander Smorkalov [Mon, 5 Jan 2015 10:48:54 +0000 (13:48 +0300)]
parallel_do replaced with parallel_for_ in driver_gpu_multi sample.

9 years agoMerge pull request #3578 from asmorkalov:ocv_avx
Vadim Pisarevsky [Mon, 12 Jan 2015 11:29:21 +0000 (11:29 +0000)]
Merge pull request #3578 from asmorkalov:ocv_avx

9 years agoFixing race condition by expanding resultsMutex lock section
Vijay Pradeep [Thu, 8 Jan 2015 23:26:15 +0000 (15:26 -0800)]
Fixing race condition by expanding resultsMutex lock section

9 years agoOpenGL interop sample reworked not ot use cvconfig.h
Alexander Smorkalov [Tue, 30 Dec 2014 13:45:46 +0000 (16:45 +0300)]
OpenGL interop sample reworked not ot use cvconfig.h

9 years agoMore accurate AVX and AVX2 control.
Alexander Smorkalov [Tue, 30 Dec 2014 17:11:42 +0000 (20:11 +0300)]
More accurate AVX and AVX2 control.

- Previous version just checked option support, but not enable it.
- Also OpenCV tests reports invalid AVX and AVX2 support status.

9 years agoMerge pull request #3565 from mshabunin:ml-leak-24
Vadim Pisarevsky [Wed, 31 Dec 2014 09:17:25 +0000 (09:17 +0000)]
Merge pull request #3565 from mshabunin:ml-leak-24

9 years agoparallel_do replaced by parallel_for_ in gpu/multi.cpp sample to get rid of cvconfig.h
Alexander Smorkalov [Tue, 30 Dec 2014 13:22:56 +0000 (16:22 +0300)]
parallel_do replaced by parallel_for_ in gpu/multi.cpp sample to get rid of cvconfig.h

9 years agoGet rid of cvconfig.h in Latent SVM samples. Use common OpenCV parallel framework...
Alexander Smorkalov [Tue, 30 Dec 2014 12:52:23 +0000 (15:52 +0300)]
Get rid of cvconfig.h in Latent SVM samples. Use common OpenCV parallel framework instead of direct TBB calls.

9 years agoFixed memory leak in ML module
Maksim Shabunin [Tue, 30 Dec 2014 12:20:24 +0000 (15:20 +0300)]
Fixed memory leak in ML module

"int * CvMLData::sample_idx" was not freed

9 years agoMerge pull request #3562 from asmorkalov:ocv_aarch64
Vadim Pisarevsky [Tue, 30 Dec 2014 11:06:00 +0000 (11:06 +0000)]
Merge pull request #3562 from asmorkalov:ocv_aarch64

9 years agoMore accurate fix for libtiff and aarch64.
Alexander Smorkalov [Sun, 28 Dec 2014 09:44:24 +0000 (12:44 +0300)]
More accurate fix for libtiff and aarch64.

9 years agoFull AARCH64 support with NEON and new CUDA toolkit.
Alexander Smorkalov [Fri, 26 Dec 2014 10:08:44 +0000 (13:08 +0300)]
Full AARCH64 support with NEON and new CUDA toolkit.

9 years agoTBB updated to 4.3u2. Fix for aarch64 support.
Alexander Smorkalov [Fri, 26 Dec 2014 09:13:42 +0000 (12:13 +0300)]
TBB updated to 4.3u2. Fix for aarch64 support.

9 years agoFix of HaarCascade GPU test for aarch64.
Alexander Smorkalov [Fri, 19 Dec 2014 16:05:53 +0000 (19:05 +0300)]
Fix of HaarCascade GPU test for aarch64.

9 years agoMerge pull request #3534 from taka-no-me:build_fixes
Vadim Pisarevsky [Fri, 26 Dec 2014 14:34:13 +0000 (14:34 +0000)]
Merge pull request #3534 from taka-no-me:build_fixes

9 years agoMerge pull request #3543 from MatMoore:2.4
Vadim Pisarevsky [Fri, 26 Dec 2014 12:11:42 +0000 (12:11 +0000)]
Merge pull request #3543 from MatMoore:2.4

9 years agoMerge pull request #3545 from jet47:gpu-match-template-tests
Vadim Pisarevsky [Fri, 26 Dec 2014 12:08:54 +0000 (12:08 +0000)]
Merge pull request #3545 from jet47:gpu-match-template-tests

9 years agofix tests for gpu::matchTemplate:
Vladislav Vinogradov [Thu, 25 Dec 2014 14:43:13 +0000 (17:43 +0300)]
fix tests for gpu::matchTemplate:

use ASSERT_FLOAT_EQ to compare float values, it is more robust for
large values

9 years agoFix Android build with the most resent android.toolchain.cmake
Andrey Kamaev [Tue, 23 Dec 2014 08:08:07 +0000 (11:08 +0300)]
Fix Android build with the most resent android.toolchain.cmake

9 years agoAssorted fixes:
Andrey Kamaev [Sun, 21 Dec 2014 14:59:50 +0000 (17:59 +0300)]
Assorted fixes:

* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings

9 years agoMerge pull request #3506 from doltac:typofix
Roman Donchenko [Wed, 24 Dec 2014 09:01:40 +0000 (09:01 +0000)]
Merge pull request #3506 from doltac:typofix

9 years agoMerge pull request #3497 from SpecLad:fs-open-fail-leak
Roman Donchenko [Wed, 24 Dec 2014 08:59:53 +0000 (08:59 +0000)]
Merge pull request #3497 from SpecLad:fs-open-fail-leak

9 years agoMinor grammar improvements to documentation
Mat Moore [Tue, 23 Dec 2014 19:15:38 +0000 (19:15 +0000)]
Minor grammar improvements to documentation

9 years agocvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
Roman Donchenko [Mon, 22 Dec 2014 15:54:39 +0000 (18:54 +0300)]
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...

... before any exceptions occur.

9 years agoMerge pull request #3471 from HelenWong:FixBug3714
Vadim Pisarevsky [Mon, 22 Dec 2014 10:55:23 +0000 (10:55 +0000)]
Merge pull request #3471 from HelenWong:FixBug3714

9 years agoMerge pull request #3484 from euphrat:gmg_update_fix
Vadim Pisarevsky [Mon, 22 Dec 2014 10:54:57 +0000 (10:54 +0000)]
Merge pull request #3484 from euphrat:gmg_update_fix

9 years agoMerge pull request #3511 from mattip:2.4
Vadim Pisarevsky [Mon, 22 Dec 2014 10:41:20 +0000 (10:41 +0000)]
Merge pull request #3511 from mattip:2.4

9 years agoMerge pull request #3514 from mshabunin:compat-24
Vadim Pisarevsky [Mon, 22 Dec 2014 10:38:55 +0000 (10:38 +0000)]
Merge pull request #3514 from mshabunin:compat-24

9 years agoMerge pull request #3500 from StevenPuttemans:fix_2432_2.4
Vadim Pisarevsky [Mon, 22 Dec 2014 10:28:33 +0000 (10:28 +0000)]
Merge pull request #3500 from StevenPuttemans:fix_2432_2.4

9 years agoMerge pull request #3515 from StevenPuttemans:fix_FeatureDetector_docs
Vadim Pisarevsky [Mon, 22 Dec 2014 10:27:01 +0000 (10:27 +0000)]
Merge pull request #3515 from StevenPuttemans:fix_FeatureDetector_docs

9 years agoFix memory leaks appearing when cvOpenFileStorage throws
Roman Donchenko [Tue, 9 Dec 2014 16:13:19 +0000 (19:13 +0300)]
Fix memory leaks appearing when cvOpenFileStorage throws

9 years agoMerge pull request #3522 from ilya-lavrenov:update_android_toolchain_cmake
Vadim Pisarevsky [Thu, 18 Dec 2014 14:49:35 +0000 (14:49 +0000)]
Merge pull request #3522 from ilya-lavrenov:update_android_toolchain_cmake

9 years agoupdate android.toolchain.cmake
Ilya Lavrenov [Wed, 17 Dec 2014 17:08:55 +0000 (20:08 +0300)]
update android.toolchain.cmake

9 years agoSome changes to make migration to 3.0 easier
Maksim Shabunin [Fri, 12 Dec 2014 07:44:10 +0000 (10:44 +0300)]
Some changes to make migration to 3.0 easier

9 years agoMerge pull request #3498 from ilya-lavrenov:omp
Vadim Pisarevsky [Mon, 15 Dec 2014 18:08:30 +0000 (18:08 +0000)]
Merge pull request #3498 from ilya-lavrenov:omp

9 years agoMerge pull request #3449 from Ashod:2.4_highgui_trackbar_improvements
Vadim Pisarevsky [Mon, 15 Dec 2014 18:02:29 +0000 (18:02 +0000)]
Merge pull request #3449 from Ashod:2.4_highgui_trackbar_improvements

9 years agofix bug 2432 for 2.4 branch
StevenPuttemans [Wed, 10 Dec 2014 12:45:42 +0000 (13:45 +0100)]
fix bug 2432 for 2.4 branch

9 years agoadd extra to FeatureDetector docs
StevenPuttemans [Mon, 15 Dec 2014 10:31:18 +0000 (11:31 +0100)]
add extra to FeatureDetector docs

9 years agoexport thread control to generated wrappers
mattip [Sun, 14 Dec 2014 09:55:02 +0000 (11:55 +0200)]
export thread control to generated wrappers

9 years agoFixed typos in latentSVM detector demo.
doltac [Thu, 11 Dec 2014 10:22:40 +0000 (19:22 +0900)]
Fixed typos in latentSVM detector demo.

9 years agoability to enable OpenMP simultaneously with other parallel framework
Ilya Lavrenov [Wed, 3 Dec 2014 11:59:51 +0000 (14:59 +0300)]
ability to enable OpenMP simultaneously with other parallel framework

9 years agohighgui: Support to change trackbar count in setTrackbarPos and replaced deprecated...
Ashod Nakashian [Tue, 25 Nov 2014 22:20:54 +0000 (17:20 -0500)]
highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows.

9 years agoMerge pull request #3480 from mshabunin:python-test-24
Vadim Pisarevsky [Sat, 6 Dec 2014 08:07:56 +0000 (08:07 +0000)]
Merge pull request #3480 from mshabunin:python-test-24