Merge branch 'hotfix/1.0.5'
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 16:04:31 +0000 (11:04 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 16:04:31 +0000 (11:04 -0500)

Trivial merge