Merge branch 'hotfix/1.0.15' master
authorLaury GvR <laury@gaslightmedia.com>
Mon, 12 Dec 2016 20:25:57 +0000 (15:25 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 12 Dec 2016 20:25:57 +0000 (15:25 -0500)

Trivial merge