Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/9949] Unit tests for user::lang()
  [ticket/9949] $user->lang() uses last int-value to get the key not first

phpBB/includes/session.php

@@ -1997,6 +1997,7 @@ class user extends session
 
 					$key_found = $num;
 				}
+				break;
 			}
 		}