Boost-1.53.0 related changes
Merge remote-tracking branch 'origin/master'