fix compile bug
Merge branch 'master' into gliding-inodes
cosmetics