Merge branch 'hotfix/2.9.12' v2.9.12
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Mar 2017 15:40:19 +0000 (11:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Mar 2017 15:40:19 +0000 (11:40 -0400)

Trivial merge