Merge branch 'hotfix/1.0.16' v1.0.16
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 18 Feb 2016 20:08:58 +0000 (15:08 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 18 Feb 2016 20:08:58 +0000 (15:08 -0500)

Trivial merge