Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 17:21:49 +0000 (12:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 17:21:49 +0000 (12:21 -0500)

Trivial merge