Merge topic 'libharu_compile_fix'

88c7e87a Merge branch 'upstream-libharu' into libharu_compile_fix
1a6dbade libharu 2017-05-12 (e189507c)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Reviewed-by: Cory Quammen <cory.quammen@kitware.com>
Merge-request: !2827