Merge pull request #3167 from Schnouki/motherless