OR-909 fix build
Merge pull request #650 in OR/rse from OR/rse-gcrosmarie:OR-909 to master

* commit '18caa98cea4948e5d5ff7940a63d38425265851e':
  OR-909 fix build