Merge branch 'hotfix/1.0.5'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 19:38:39 +0000 (14:38 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 19:38:39 +0000 (14:38 -0500)

Trivial merge