Merge branch 'hotfix/1.2.18' v1.2.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 14:24:59 +0000 (09:24 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 14:24:59 +0000 (09:24 -0500)

Trivial merge