Merge tag 'v2.10.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 9 Aug 2017 18:30:12 +0000 (14:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 9 Aug 2017 18:30:12 +0000 (14:30 -0400)
Version 2.10.5


Trivial merge