gustafn
committed
on 09 Sep 13
- backport patch from HEAD