Merge tag 'v1.0.18' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 18:07:32 +0000 (14:07 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 18:07:32 +0000 (14:07 -0400)
version 1.0.18


Trivial merge