Merge tag 'v1.1.25' into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 14 Jul 2017 16:03:34 +0000 (12:03 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 14 Jul 2017 16:03:34 +0000 (12:03 -0400)
version 1.1.25


Trivial merge