Merge branch 'hotfix/1.0.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 17 Aug 2015 12:56:32 +0000 (08:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 17 Aug 2015 12:56:32 +0000 (08:56 -0400)

Trivial merge