Merge remote-tracking branch 'remotes/origin/BR_2017' into BR_1427

author isn <isn@opencascade.com>

Mon, 20 Nov 2017 15:19:57 +0000 (18:19 +0300)

committer isn <isn@opencascade.com>

Mon, 20 Nov 2017 15:19:57 +0000 (18:19 +0300)
author isn <isn@opencascade.com>
Mon, 20 Nov 2017 15:19:57 +0000 (18:19 +0300)
committer isn <isn@opencascade.com>
Mon, 20 Nov 2017 15:19:57 +0000 (18:19 +0300)
diff --cc src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
Simple merge
author	isn <isn@opencascade.com>
	Mon, 20 Nov 2017 15:19:57 +0000 (18:19 +0300)
committer	isn <isn@opencascade.com>
	Mon, 20 Nov 2017 15:19:57 +0000 (18:19 +0300)