Merge branch 'release/2.10.6' v2.10.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 11 Aug 2017 18:53:50 +0000 (14:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 11 Aug 2017 18:53:50 +0000 (14:53 -0400)

Trivial merge