Merge branch 'hotfix/1.2.10' v1.2.10
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:36:01 +0000 (14:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:36:01 +0000 (14:36 -0400)

Trivial merge