Merge branch 'release/3.4'

This commit is contained in:
Dylan K. Taylor
2018-11-26 14:02:59 +00:00