Merge branch 'release/2.10.5' v2.10.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 9 Aug 2017 18:30:04 +0000 (14:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 9 Aug 2017 18:30:04 +0000 (14:30 -0400)

Trivial merge