Merge branch '2.3' into 2.7

* 2.3:
  [Yaml] fix exception contexts
  People - person singularization
  [Yaml] properly handle unindented collections
  chomp newlines only at the end of YAML documents

Author: fabpot

StringUtil.php

@@ -124,6 +124,9 @@ class StringUtil
 
         // chateaux (chateau)
         array('xuae', 4, false, true, 'eau'),
+
+        // people (person)
+        array('elpoep', 6, true, true, 'person'),
     );
 
     /**

Tests/StringUtilTest.php

@@ -107,6 +107,8 @@ public function singularifyProvider()
             array('objectives', 'objective'),
             array('oxen', 'ox'),
             array('parties', 'party'),
+            array('people', 'person'),
+            array('persons', 'person'),
             array('phenomena', array('phenomenon', 'phenomenum')),
             array('photos', 'photo'),
             array('pianos', 'piano'),