Merge branch '3.5'

This commit is contained in:
Dylan K. Taylor
2019-01-19 13:57:42 +00:00