Merge pull request #1115 from laanwj/2012_04_cleanupmisc