Merge pull request #1350 from kugel-/for-upstream