Merge branch 'release/2.10.12' v2.10.12
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 27 Sep 2017 13:13:27 +0000 (09:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 27 Sep 2017 13:13:27 +0000 (09:13 -0400)

Trivial merge