[GAIA BUG984584] - moar testssss
Merge pull request #286 from michalbe/Bug984584-temp

[GAIA BUG984584] - moar testssss