Merge branch 'hotfix/1.0.17' v1.0.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 7 Jul 2016 13:11:01 +0000 (09:11 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 7 Jul 2016 13:11:01 +0000 (09:11 -0400)
commitb17f9bafc4aa1268768719ce84d02a5714fd625a
tree4668bfb23716c029ee5a9094965b85fbd58c8f9c
parenta1b0dae14b42ac0b78fcf1a7f18923abfea2eca7
parent3264783dc054f99bcc90ab9e9c30c52584902b68
Merge branch 'hotfix/1.0.17'