fix more boost warnings
Merge branch 'master' into logan