Merge branch 'release/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Jun 2015 19:55:56 +0000 (15:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Jun 2015 19:55:56 +0000 (15:55 -0400)

Trivial merge