Initial work on formatting code according to PSR-2
Merge branch '3.8'