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)
commit635991c5ce528ee8056d53a182ac3db9ac443412
treeaeb684dc87385f3c19a6bfab296bcce5db9ec957
parenta744f957ce308b8255f90fe8d239a6406077e07a
parentb6adfcdd9996659d96776f2448d2210a0c840650
Merge branch 'hotfix/1.0.15'