Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 27 Apr 2017 18:27:43 +0000 (14:27 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 27 Apr 2017 18:27:43 +0000 (14:27 -0400)
commit6ed08a82b653ca5c4d045455c7084d8b21eee1e9
treec2732e362d95a5eb520ae280253cdd5b3bc5b646
parentfdc53d3683325f0b33170610da298a311e26f5d6
parent34cb19112c1d0b407462a4c4ce923ff47e1d7efb
Merge branch 'hotfix/1.0.15'