Merge tag 'v2.10.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 11 Aug 2017 18:53:58 +0000 (14:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 11 Aug 2017 18:53:58 +0000 (14:53 -0400)
Version 2.10.6


Trivial merge