Bugfix for issue #1113
Merge pull request #1114 from prg/master

Bugfix for issue #1113