Merge branch 'release/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 19 Apr 2016 20:13:26 +0000 (16:13 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 19 Apr 2016 20:13:26 +0000 (16:13 -0400)

Trivial merge