Merge Valessio's branch 'lp2019' into stable
authorTechnologyClassroom <michael.steven.mcmahon@gmail.com>
Wed, 13 Mar 2019 19:05:01 +0000 (15:05 -0400)
committerTechnologyClassroom <michael.steven.mcmahon@gmail.com>
Wed, 13 Mar 2019 19:05:01 +0000 (15:05 -0400)

Trivial merge