Merge branch 'hotfix/1.0.18' v1.0.18
authorIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 18:07:01 +0000 (14:07 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 18:07:01 +0000 (14:07 -0400)
commit0d9623cc328c6eb12f06249d0eeb9541f2a47f0e
treef201b530f21d75e32a0a41297a6d2f559b450368
parent32dc2ce6532ecbcffa8c699436cdd24f0cda5271
parent7527cdbff94034f1bc9e94f8df6c34eeab51270e
Merge branch 'hotfix/1.0.18'