Bug 918501
Merge pull request #1566 from lnader/master

Bug 918501