Merge remote-tracking branch 'biomimetics/imageproc2.5-integration' into imageproc2.5-integration
Terminated #ifndef
One too many set of define guards is not kosher