The first bug-fix release of the 3.1 series

  * Locator.nonsingular return order API change

Lots of backports of various bug fixes.