gustafn
committed
on 12 Aug 15
- applying resolve-local patch from HEAD