Merge tag 'v1.1.26' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 29 Jun 2017 18:07:52 +0000 (14:07 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 29 Jun 2017 18:07:52 +0000 (14:07 -0400)
version 1.1.26


Trivial merge