bug_956
bug_956, tests
Merge remote-tracking branch 'upstream/master' into bug_956
bug_956, patch 1
Merge pull request #4 from kkorekk/bug_956

Bug 956