Add info on Boost as optional dep
Merge remote-tracking branch 'upstream/master'