Merge branch 'hotfix/1.1.6' v1.1.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:08:21 +0000 (16:08 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:08:21 +0000 (16:08 -0400)

Trivial merge