Upgrade to PHP_TokenStream 1.1.6
Merge branch '3.7'