Merge tag 'v2.9.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Mar 2017 15:40:27 +0000 (11:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Mar 2017 15:40:27 +0000 (11:40 -0400)
Version 2.9.12


Trivial merge