gustafn
committed
on 14 Aug 15
- backport from head