Fix for #930
Merge origin/master