Merge branch 'hotfix/1.2.10'
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 18:58:22 +0000 (14:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 18:58:22 +0000 (14:58 -0400)

Trivial merge