test
[GAIA BUG1018819] - Final version
Merge pull request #324 from michalbe/Bug1018819-temp

Bug1018819 temp