Small fix for Intel compiler warning.

Extra helper for finding Boost.
Merge branch 'garth/fix-for-intel-compiler' into next