Old Boost #include also type qualifier
Merge remote-tracking branch 'upstream/master'