Fix a clang warning
Merge branch 'master' into fst