Merge pull request #1261 from mpg/merge-3.6

[3.6] merge public into -restricted