Merge branch 'stable-3.6' into stable-3.7 * stable-3.6: Update gitignore Change-Id: I693d9e2ea014a5d82dcc5af1889bab5c1a112857