[GAIA BUG984584] - Tests
Merge pull request #285 from michalbe/Bug984584-temp

[GAIA BUG984584] - Tests