Merge branch '1.7.x'

This commit is contained in:
Alexey Sokolov
2018-05-11 20:08:47 +01:00
+1 -1
Submodule docker updated: 39116f34fa...0a6de9c970