Bug 911322
Merge pull request #1561 from lnader/master

Bug 911322