Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:34:40 +0000 (13:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:34:40 +0000 (13:34 -0400)

Trivial merge