Merge branch 'hotfix/1.1.8' v1.1.8
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 15:42:16 +0000 (10:42 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 15:42:16 +0000 (10:42 -0500)

Trivial merge