Merge pull request #215 from OpenMW/master

Add OpenMW commits up to 9 May 2017

apps/openmw/mwdialogue/dialoguemanagerimp.cpp

@@ -645,6 +645,12 @@ namespace MWDialogue
             return;
         }
 
+        if (actor.getClass().isNpc() && MWBase::Environment::get().getWorld()->isSwimming(actor))
+        {
+            // NPCs don't talk while submerged
+            return;
+        }
+
         const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
         const ESM::Dialogue *dial = store.get<ESM::Dialogue>().find(topic);