Merge pull request #1177 from laanwj/2012_05_remove_duplicate_securestring