Merge remote-tracking branch 'upstream/stable' into stable_merge2

This commit is contained in:
Brad Davis 2016-10-07 17:14:36 -07:00
commit c6a890af40

Diff content is not available