Merge branch 'hotfix/1.0.16' v1.0.16
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 7 Jul 2016 12:58:27 +0000 (08:58 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 7 Jul 2016 12:58:27 +0000 (08:58 -0400)

Trivial merge