make boost support optional
Merge remote-tracking branch 'origin/master' into reflect_refactor