Merge branch 'hotfix/1.0.16' v1.0.16
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 24 Jun 2016 15:52:00 +0000 (11:52 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 24 Jun 2016 15:52:00 +0000 (11:52 -0400)

Trivial merge