Merge pull request #1083 from laanwj/2012_04_connectionicon