Fix compiler warning due to different boost versions
Merge remote-tracking branch 'origin/master' into Design