Implement patch as submitted by Mark Wubben.  Fixes #9313 !strict.
Implement patch as submitted by Mark Wubben.  Fixes #9313 !strict.

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

redaktor/deliteful