fixed warning on linux
Merge branch 'master' into remote-objects