Merge branch 'hotfix/1.2.19' v1.2.19
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 10 Feb 2017 19:30:20 +0000 (14:30 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 10 Feb 2017 19:30:20 +0000 (14:30 -0500)

Trivial merge