Merge branch 'hotfix/1.0.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Jul 2015 18:05:26 +0000 (14:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Jul 2015 18:05:26 +0000 (14:05 -0400)

Trivial merge