Merge branch 'hotfix/1.1.9' v1.1.9
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 15:47:12 +0000 (10:47 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 15:47:12 +0000 (10:47 -0500)

Trivial merge