Merge pull request #485 from huceke/trunk-fixes