Merge branch 'hotfix/1.1.18' v1.1.18
authorIan Weller <ian@gaslightmedia.com>
Thu, 18 Aug 2016 19:36:22 +0000 (15:36 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 18 Aug 2016 19:36:22 +0000 (15:36 -0400)
commit18d055ae7094ae0c2b74b1385b1fcf20c0c99195
tree552f4cf1562c1485c9235458a2c5b2c9ed82eafb
parent0838f8c0d3e07c8acbfb28f1853d1e0bdafa5ee6
parent454db91ed3b9a5ab4a96116b1e54f41069e2393d
Merge branch 'hotfix/1.1.18'