Merge pull request #439 from mono-soc-2012/garyb/iconfix