Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Update git submodules
  Update git submodules
  Update git submodules

Change-Id: Id0c79b60b8f9171492cf7da1c6741dd6f29c8b7f