Fixing a merge issue for previous commit
authorLaury GvR <laury@gaslightmedia.com>
Tue, 28 Feb 2017 15:44:02 +0000 (10:44 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 28 Feb 2017 15:44:02 +0000 (10:44 -0500)

Trivial merge