Merge tag 'v1.1.18' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 18 Aug 2016 19:36:48 +0000 (15:36 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 18 Aug 2016 19:36:48 +0000 (15:36 -0400)
version 1.1.18


Trivial merge