Vladimír Čunát 2858c41823
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
2017-08-29 10:51:54 +02:00
..
2017-08-25 19:36:14 +02:00
2017-08-28 10:40:27 +01:00