Merge 3.16 into core/master and related master branches

This commit is contained in:
Andrew Johnson
2018-02-05 13:59:12 -06:00
11 changed files with 93 additions and 24 deletions