gustafn
committed
on 22 Oct 17
Fixes for previous commit