Merge tag 'v1.1.18' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 10 May 2016 20:36:53 +0000 (16:36 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 10 May 2016 20:36:53 +0000 (16:36 -0400)
commitef2d85afd5f5fb30c5c133ff05de88d393382926
treeb897a6be9b1415ccaeaab66b42104b73b3cd1b13
parent2d328a8898cdbf312248c98b05d514f728dfda28
parent3e9ac44b00751f2c276b195e47d99e783be83236
Merge tag 'v1.1.18' into develop

version 1.1.18