Merge branch 'stable-3.7'

* stable-3.7:
  Update gitignore

Change-Id: I731c7dbd661d17ad7ebe1b961d175cfe71fdb343