Checkout
Marcel Reutegger
committed
on 05 Feb
OAK-8894: Build error on travis-ci

Merge revisions 1873631 and 1873634 from trunk