gustafn
committed
on 29 Apr 15
- backport from HEAD