Merge branch 'hotfix/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 28 Feb 2017 15:42:54 +0000 (10:42 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 28 Feb 2017 15:42:54 +0000 (10:42 -0500)
commit828584f5d3101913d7f1f249842ca3c28dda6295
treea62b34f75259bd19fe3a8544ea85637a2ce9de91
parentd164dec34e046fb5b25e980dd82012d300e4a64e
parent5b0b54657657db9d086064008037516c4008d87a
Merge branch 'hotfix/1.0.11'