Upgrade to PHP_TokenStream 1.1.7
Merge branch '3.7'