Fix some warnings
Add PickStdType class
Merge branch 'master' into travis.linux