Merge branch 'hotfix/1.0.16'
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 15:29:55 +0000 (11:29 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 15:29:55 +0000 (11:29 -0400)

Trivial merge