Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:

Change-Id: Ic8b534cc22ead13bc50deca203a10e8af7fd81a6