Merge branch 'release/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Wed, 17 Jun 2015 17:45:44 +0000 (13:45 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 17 Jun 2015 17:45:44 +0000 (13:45 -0400)

Trivial merge