orfeo-40: revised; recent commits on 4.0.0 to get it building again (pre-4.0.1)