Merge branch 'hotfix/1.2.18' v1.2.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 19:11:51 +0000 (14:11 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 19:11:51 +0000 (14:11 -0500)

Trivial merge