Merge branch 'release/1.1.25' v1.1.25
authorIan Weller <ian@gaslightmedia.com>
Fri, 14 Jul 2017 16:03:12 +0000 (12:03 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 14 Jul 2017 16:03:12 +0000 (12:03 -0400)

Trivial merge