Merge tag 'v1.0.18' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 17:42:54 +0000 (13:42 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 17:42:54 +0000 (13:42 -0400)
version 1.0.18


Trivial merge