Merge branch 'hotfix/1.0.27'
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 31 Mar 2016 18:39:34 +0000 (14:39 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 31 Mar 2016 18:39:34 +0000 (14:39 -0400)

Trivial merge