Updated to 3.1.6

Require some tests but it compiles.