Merge branch 'release/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jun 2015 14:17:03 +0000 (10:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jun 2015 14:17:03 +0000 (10:17 -0400)

Trivial merge