Fixes Bug 1038389 - Make Your Own minor bugfixes
Merge pull request #871 from gesa/1038389/bugfixes

Fixes Bug 1038389 - Make Your Own minor bugfixes
1.1.27