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)
version 1.1.18


Trivial merge