make bug 997131 work actually work on both sides of the change and merge branches
authorRobert Kaiser <kairo@kairo.at>
Sun, 6 Jul 2014 23:53:12 +0000 (01:53 +0200)
committerRobert Kaiser <kairo@kairo.at>
Sun, 6 Jul 2014 23:53:12 +0000 (01:53 +0200)

Trivial merge