Merge branch 'release/3.5'

This commit is contained in:
Dylan K. Taylor
2018-12-12 19:51:41 +00:00
26 changed files with 532 additions and 44 deletions

File diff suppressed because one or more lines are too long