Merge pull request #1163 from laanwj/2012_04_uiperformanceissue