Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 15:14:58 +0000 (10:14 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 15:14:58 +0000 (10:14 -0500)

Trivial merge