Merge remote-tracking branch 'origin/master' into c++11

Conflicts:
	src/Noise/Noise.h
	src/World.h

src/Entities/Player.cpp

@@ -1596,6 +1596,9 @@ bool cPlayer::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn)
 	a_World->AddPlayer(this);
 	SetWorld(a_World);  // Chunks may be streamed before cWorld::AddPlayer() sets the world to the new value
 
+	// Update the view distance.
+	m_ClientHandle->SetViewDistance(m_ClientHandle->GetRequestedViewDistance());
+
 	return true;
 }