Merge branch 'hotfix/1.0.16' v1.0.16
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 13:51:07 +0000 (09:51 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 13:51:07 +0000 (09:51 -0400)

Trivial merge