Merge branch 'stable-2.16'

* stable-2.16:
  Set next version to 3.1

Change-Id: I71973fc0b2e2764997f7007beabb2d257ca3f6eb