Merge branch 'PHP-7.1'

7.1.x release shouldn't have been pn mainline PHP-7.1 branch
Fix the merge history to keep master in place.

* PHP-7.1:
  bump versions

Author: sgolemon