Merge branch 'release/1.0.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Jun 2015 15:32:30 +0000 (11:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Jun 2015 15:32:30 +0000 (11:32 -0400)

Trivial merge