Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 18:19:07 +0000 (14:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 18:19:07 +0000 (14:19 -0400)

Trivial merge