Merge branch 'master' into osx_zuffy
Merge branch 'master' into osx_zuffy
Merge branch 'master' into osx_zuffy
Merge branch 'master' into osx_zuffy
 cache query
Merge branch 'osx_zuffy'

cache query.