Merge branch 'hotfix/1.0.1a' v1.0.1a
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 26 May 2016 21:04:59 +0000 (17:04 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 26 May 2016 21:04:59 +0000 (17:04 -0400)

Trivial merge