sync project with setting
...
remove some reduntant cast
floor useless
Merge remote-tracking branch 'origin/master' into master-c++11