Merge pull request #1082 from bastelfreak/foo