Tudor Malene 8dc394b117 Merge fixes
Fix bug

Fix bug

Fix tests

Fix tests
2018-10-24 13:37:37 +01:00
..
2018-10-24 13:37:37 +01:00