Merge remote-tracking branch 'upstream/develop' into issue-4816
authorMichael <heluecht@pirati.ca>
Thu, 12 Apr 2018 08:53:56 +0000 (08:53 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 12 Apr 2018 08:53:56 +0000 (08:53 +0000)

Trivial merge