gustafn
committed
on 23 Jul 17
commit after merge conflict