gustafn
committed
on 27 Jul 15
- backport changes