Merge branch '2.4' into master
authorAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 16 Dec 2016 14:04:32 +0000 (17:04 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 16 Dec 2016 14:04:32 +0000 (17:04 +0300)
commit0a4694d6e0f1bd41516c7885d77626972e416d6c
tree8c64a85c65f16f897916149d83bc3b5e0357fc3f
parent0e4dde1781d6439eb5377e22208a0eb6f6cd404e
parentc7ae26bf24812982b039b43a2d3516dcff1aa232
Merge branch '2.4' into master