Merge branch 'release/1.6.26' v1.6.26
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Mar 2017 18:17:47 +0000 (14:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Mar 2017 18:17:47 +0000 (14:17 -0400)

Trivial merge