Merge tag 'v2.10.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Aug 2017 19:46:09 +0000 (15:46 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Aug 2017 19:46:09 +0000 (15:46 -0400)
Version 2.10.2


Trivial merge