checked in fixes from liyang.  !strict Fixes #10963, Refs #9948
checked in fixes from liyang.  !strict Fixes #10963, Refs #9948


git-svn-id: ee6e786acc44c9cca5ee17c71a5576c45c210361@21771 560b804f-0ae3-0310-86f3-f6aa0a117693

redaktor/deliteful