fixed a compilation issue
Merge branch 'master' into fomosto