Master bug#10562

Fix for master branch