#
# ChangeLog for stable
#
# Generated by Trac 1.0.12
# 11/22/24 11:47:36

Thu, 19 Nov 2015 13:08:05 GMT mkommend [13299]
	* stable (modified)

	#2444: Recorded merge info for r13191.


Thu, 19 Nov 2015 12:46:27 GMT gkronber [13298]
	* stable/HeuristicLab.Algorithms.DataAnalysis.Views (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj (modified)
	* stable/HeuristicLab.Tests (modified)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPMultiplexerSampleTest.cs (modified)

	#2428: partial merge of r13160 from trunk to stable


Thu, 19 Nov 2015 12:35:44 GMT gkronber [13297]
	* stable (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesAlgorithm.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassification.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourClassification.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourRegression.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkClassification.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleClassification.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkEnsembleRegression.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkRegression.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestClassification.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestRegression.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorClassification.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegression.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/TimeSeries/AutoregressiveModeling.cs (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean/MultiplexerProblem.cs (modified)
	* stable/HeuristicLab.Problems.GrammaticalEvolution (modified)
	* stable/HeuristicLab.Problems.GrammaticalEvolution/3.4/ArtificialAnt/GEArtificialAntProblem.cs (modified)
	* stable/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicRegressionSingleObjectiveProblem.cs (modified)

	#2454: merged r13238:13239 from trunk to stable


Thu, 19 Nov 2015 12:34:42 GMT gkronber [13296]
	* stable (modified)
	* stable/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy/3.3/OffspringSelectionEvolutionStrategy.cs (modified)
	* stable/HeuristicLab.Optimization.Operators/3.3/ChildrenCopyCreator.cs (modified)
	* stable/HeuristicLab.Selection/3.3/EvolutionStrategyOffspringSelector.cs (modified)
	* stable/HeuristicLab.Tests (modified)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/OSESGriewankSampleTest.cs (copied)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/SamplesUtils.cs (modified)
	* stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified)

	#2478: merged r13237,r13261 from trunk to stable


Thu, 19 Nov 2015 12:33:36 GMT gkronber [13295]
	* stable (modified)
	* stable/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAEvolutionStrategy.cs (modified)
	* stable/HeuristicLab.Algorithms.EvolutionStrategy/3.3/EvolutionStrategy.cs (modified)
	* stable/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs (modified)
	* stable/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs (modified)
	* stable/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs (modified)
	* stable/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy/3.3/OffspringSelectionEvolutionStrategy.cs (modified)
	* stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithm.cs (modified)
	* stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified)
	* stable/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs (modified)
	* stable/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs (modified)
	* stable/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/ParticleSwarmOptimization.cs (modified)
	* stable/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified)
	* stable/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealing.cs (modified)
	* stable/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs (modified)
	* stable/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs (modified)
	* stable/HeuristicLab.Problems.Binary/3.3/HIFFProblem.cs (modified)
	* stable/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (modified)
	* stable/HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblem.cs (modified)
	* stable/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs (modified)
	* stable/HeuristicLab.Problems.QuadraticAssignment (modified)
	* stable/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSearch.cs (modified)
	* stable/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified)
	* stable/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs (modified)
	* stable/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified)
	* stable/HeuristicLab.Problems.VehicleRouting (modified)
	* stable/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified)

	#2454: merged r13173 from trunk to stable


Thu, 19 Nov 2015 12:31:58 GMT gkronber [13294]
	* stable (modified)
	* stable/HeuristicLab 3.3.sln (modified)
	* stable/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy (copied)
	* stable/HeuristicLab.Optimization.Operators/3.3/ChildrenCopyCreator.cs (copied)
	* stable/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj (modified)
	* stable/HeuristicLab.Selection/3.3/EvolutionStrategyOffspringSelector.cs (copied)
	* stable/HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj (modified)

	#2478: merged r13164,13165 from trunk to stable (resolving conflict ...


Thu, 19 Nov 2015 12:29:26 GMT gkronber [13293]
	* stable (modified)
	* stable/HeuristicLab 3.3.sln (modified)
	* stable/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy (deleted)
	* stable/HeuristicLab.Optimization.Operators/3.3/ChildrenCopyCreator.cs (deleted)
	* stable/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj (modified)
	* stable/HeuristicLab.Selection/3.3/EvolutionStrategyOffspringSelector.cs (deleted)
	* stable/HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj (modified)
	* stable/HeuristicLab.Tests (modified)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/OSESGriewankSampleTest.cs (deleted)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/SamplesUtils.cs (modified)
	* stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified)

	#2478 reverse merge of r13292


Thu, 19 Nov 2015 12:24:15 GMT gkronber [13292]
	* stable (modified)
	* stable/HeuristicLab 3.3.sln (modified)
	* stable/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy (copied)
	* stable/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy/3.3/OffspringSelectionEvolutionStrategy.cs (modified)
	* stable/HeuristicLab.Optimization.Operators/3.3/ChildrenCopyCreator.cs (copied)
	* stable/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj (modified)
	* stable/HeuristicLab.Selection/3.3/EvolutionStrategyOffspringSelector.cs (copied)
	* stable/HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj (modified)
	* stable/HeuristicLab.Tests (modified)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/OSESGriewankSampleTest.cs (copied)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/SamplesUtils.cs (modified)
	* stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified)

	#2478: merged r13164,r13165,r13237,r13261 from trunk to stable ...


Thu, 19 Nov 2015 11:06:10 GMT gkronber [13290]
	* stable (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessCovarianceOptimizationProblem.cs (modified)

	#1967: merged r13200,r13201,r13209,r13234,r13242 from trunk to stable


Thu, 19 Nov 2015 11:02:40 GMT mkommend [13289]
	* stable (modified)
	* stable/HeuristicLab.Data.Views (modified)
	* stable/HeuristicLab.Data.Views/3.3 (modified)
	* stable/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified)
	* stable/HeuristicLab.DataPreprocessing.Views (modified)
	* stable/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.Designer.cs (modified)
	* stable/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified)
	* stable/HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj (modified)
	* stable/HeuristicLab.DataPreprocessing.Views/3.4/RenameColumnsDialog.Designer.cs (copied)
	* stable/HeuristicLab.DataPreprocessing.Views/3.4/RenameColumnsDialog.cs (copied)
	* stable/HeuristicLab.DataPreprocessing/3.4 (modified)
	* stable/HeuristicLab.DataPreprocessing/3.4/Implementations/DataGridContent.cs (modified)
	* stable/HeuristicLab.DataPreprocessing/3.4/Implementations/FilteredPreprocessingData.cs (modified)
	* stable/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs (modified)
	* stable/HeuristicLab.DataPreprocessing/3.4/Implementations/TransactionalPreprocessingData.cs (modified)
	* stable/HeuristicLab.DataPreprocessing/3.4/Interfaces/IPreprocessingData.cs (modified)
	* stable/HeuristicLab.DataPreprocessing/3.4/ProblemDataCreator.cs (modified)

	#2486: Merged r12983, r12986, r13252 and r13271 into stable.


Thu, 19 Nov 2015 10:59:51 GMT gkronber [13287]
	* stable/HeuristicLab.Algorithms.DataAnalysis (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessCovarianceOptimizationProblem.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModel.cs (modified)

	#1967: partial merge of r13160 from trunk to stable


Thu, 19 Nov 2015 10:58:50 GMT gkronber [13286]
	* stable (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessCovarianceOptimizationProblem.cs (copied)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/Plugin.cs.frame (modified)

	#1967: merged r12946,r12948,r12953,r12954 from trunk to stable


Thu, 19 Nov 2015 10:56:45 GMT ascheibe [13285]
	* stable (modified)
	* stable/HeuristicLab 3.3.sln (modified)
	* stable/HeuristicLab.Algorithms.ALPS (copied)
	* stable/HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj (modified)
	* stable/HeuristicLab.Algorithms.ALPS/3.3/ResultsHistoryWiper.cs (modified)
	* stable/HeuristicLab.Optimizer (modified)
	* stable/HeuristicLab.Optimizer/3.3/Documents/ALPSGA_TSP.hl (copied)
	* stable/HeuristicLab.Optimizer/3.3/Documents/ALPSGP_SymReg.hl (copied)
	* stable/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified)
	* stable/HeuristicLab.Optimizer/3.3/StartPage.cs (modified)
	* stable/HeuristicLab.Tests (modified)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/AlpsSampleTest.cs (copied)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/SamplesUtils.cs (modified)
	* stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified)

	#2269 merged r13214, r13217, r13223, r13224, r13226, r13228, r13231, ...


Thu, 19 Nov 2015 10:55:52 GMT mkommend [13284]
	* stable (modified)

	#2466: Recorded merge info for merge of r12886 into stable (r13196).


Thu, 19 Nov 2015 10:45:22 GMT gkronber [13283]
	* stable (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessClassification.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessClassificationSolutionCreator.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessRegression.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessRegressionSolutionCreator.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestClassification.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestRegression.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorClassification.cs (modified)
	* stable/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegression.cs (modified)

	#2385: merged r12934,r13204,r13205,r13270 from trunk to stable


Thu, 19 Nov 2015 10:43:43 GMT mkommend [13282]
	* stable (modified)
	* stable/HeuristicLab.Optimization (modified)
	* stable/HeuristicLab.Optimization.Views (modified)
	* stable/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified)
	* stable/HeuristicLab.Optimization.Views/3.3/ThresholdTerminatorView.Designer.cs (copied)
	* stable/HeuristicLab.Optimization.Views/3.3/ThresholdTerminatorView.cs (copied)
	* stable/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified)
	* stable/HeuristicLab.Optimization/3.3/Interfaces/ITerminationBasedOperator.cs (copied)
	* stable/HeuristicLab.Optimization/3.3/Interfaces/ITerminator.cs (copied)
	* stable/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified)
	* stable/HeuristicLab.Optimization/3.3/Termination (copied)

	#2027: Merged r12975, r12976 and r13137 into stable.


Thu, 19 Nov 2015 10:43:07 GMT gkronber [13281]
	* stable (modified)
	* stable/HeuristicLab.Problems.GrammaticalEvolution (modified)
	* stable/HeuristicLab.Problems.GrammaticalEvolution/3.4/ArtificialAnt/GEArtificialAntProblem.cs (modified)

	#2512: merged r13233, r13243 from trunk to stable


Thu, 19 Nov 2015 10:42:02 GMT gkronber [13280]
	* stable (modified)
	* stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified)
	* stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeProblem.cs (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Interpreter.cs (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Problem.cs (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Trail.cs (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/BasicSymbolicRegression (copied)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/BasicSymbolicRegression/Problem.cs (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean (copied)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean/EvenParityProblem.cs (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean/MultiplexerProblem.cs (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/HeuristicLab.Problems.GeneticProgramming-3.3.csproj (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Interpreter.cs (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Problem.cs (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Solution.cs (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/Plugin.cs.frame (modified)
	* stable/HeuristicLab.Tests (modified)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPArtificialAntSampleTest.cs (modified)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPLawnMowerSampleTest.cs (modified)
	* stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPMultiplexerSampleTest.cs (modified)
	* stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified)
	* stable/HeuristicLab.Tests/Test Resources/multiplexer11.csv (deleted)

	#2472: merged ...


Thu, 19 Nov 2015 10:39:43 GMT gkronber [13279]
	* stable (modified)
	* stable/HeuristicLab 3.3.sln (modified)
	* stable/HeuristicLab.Problems.ArtificialAnt (modified)
	* stable/HeuristicLab.Problems.ArtificialAnt.Views/3.5 (deleted)
	* stable/HeuristicLab.Problems.ArtificialAnt/3.5 (deleted)
	* stable/HeuristicLab.Problems.GeneticProgramming (copied)
	* stable/HeuristicLab.Problems.GeneticProgramming.Views (copied)
	* stable/HeuristicLab.Problems.GeneticProgramming.Views/3.3/Plugin.cs.frame (modified)
	* stable/HeuristicLab.Problems.GeneticProgramming/3.3/Plugin.cs.frame (modified)
	* stable/HeuristicLab.Problems.GrammaticalEvolution (modified)
	* stable/HeuristicLab.Problems.GrammaticalEvolution/3.3/ArtificialAnt/GEArtificialAntProblem.cs (modified)
	* stable/HeuristicLab.Problems.GrammaticalEvolution/3.3/Symbolic/GESymbolicRegressionSingleObjectiveProblem.cs (modified)
	* stable/HeuristicLab.Problems.GrammaticalEvolution/3.4 (copied)
	* stable/HeuristicLab.Problems.LawnMower (modified)
	* stable/HeuristicLab.Problems.LawnMower.Views/3.4 (deleted)
	* stable/HeuristicLab.Problems.LawnMower/3.4 (deleted)

	#2472: merged r12911-12912, r12915-12918 from trunk to stable


Thu, 19 Nov 2015 10:38:16 GMT gkronber [13278]
	* stable (modified)
	* stable/HeuristicLab 3.3.sln (modified)
	* stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified)
	* stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj (modified)
	* stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeProblem.cs (copied)
	* stable/HeuristicLab.Problems.ArtificialAnt (modified)
	* stable/HeuristicLab.Problems.ArtificialAnt.Views/3.5 (copied)
	* stable/HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntProblem.cs (modified)
	* stable/HeuristicLab.Problems.ArtificialAnt/3.5 (copied)
	* stable/HeuristicLab.Problems.LawnMower (modified)
	* stable/HeuristicLab.Problems.LawnMower.Views/3.3/HeuristicLab.Problems.LawnMower.Views-3.3.csproj (modified)
	* stable/HeuristicLab.Problems.LawnMower.Views/3.4 (copied)
	* stable/HeuristicLab.Problems.LawnMower/3.3/HeuristicLab.Problems.LawnMower-3.3.csproj (modified)
	* stable/HeuristicLab.Problems.LawnMower/3.3/Problem.cs (modified)
	* stable/HeuristicLab.Problems.LawnMower/3.4 (copied)

	#2472: merged r12895:12906 from trunk to stable