Merge tag 'v2.10.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 27 Sep 2017 13:13:35 +0000 (09:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 27 Sep 2017 13:13:35 +0000 (09:13 -0400)
Version 2.10.12


Trivial merge