Thanks to everyone involved in reviewing this code! (See CR-112) CORE-13056 svn path=/trunk/; revision=74309