gustafn
committed
on 15 Jun 15
- backport of fix for issue #3250