Update to 31 (5.1.31 equivalent)

* Remove SunOS hack temporary.
  I will do tests on SunOS later.