Merge branch 'hotfix/1.1.15' v1.1.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 14:07:34 +0000 (09:07 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 14:07:34 +0000 (09:07 -0500)
commit8402b3aa8645db9385e137cf27ec8b432b59efe5
tree443ee8dade878f4b4f65f1bd2be55fa7b25ef141
parent9369b17f8ffacc9310e625c7b4ea5319c6021906
parente481947f5fb6e2f6507d5497cd2881ef8cc8d446
Merge branch 'hotfix/1.1.15'