Fixed compiler warning
Merge branch 'master' into gmail