merge master branch@2014.10.26