Fix formatting. Update to 2.13-SNAPSHOT

Almost ready for 3.0