Merge tag 'v1.1.25' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 29 Jun 2017 17:49:34 +0000 (13:49 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 29 Jun 2017 17:49:34 +0000 (13:49 -0400)
version 1.1.25


Trivial merge