Merge branch 'release/1.0.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Jun 2015 14:39:15 +0000 (10:39 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 30 Jun 2015 14:39:15 +0000 (10:39 -0400)

Trivial merge