Merge branch 'hotfix/1.0.19' v1.0.19
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Feb 2016 15:45:02 +0000 (10:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Feb 2016 15:45:02 +0000 (10:45 -0500)

Trivial merge