Fix Boost header path inclusing if found
Merge branch 'vigsterkr-develop' into develop