Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Update git submodules
  Update git submodules

Change-Id: Iacd42b02881fc3948047a054909b7de67d28fb9a