Add boost stub [skip ci]
Fix build
Merge branch 'update' into update.macosx