Merge branch 'hotfix/1.0.16' v1.0.16
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 27 Apr 2017 18:31:24 +0000 (14:31 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 27 Apr 2017 18:31:24 +0000 (14:31 -0400)

Trivial merge