Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:59:52 +0000 (14:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:59:52 +0000 (14:59 -0500)

Trivial merge