merge docker_release@2014.10.31