Merge branch 'hotfix/1.2.10' v1.2.10
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Jun 2016 18:00:30 +0000 (14:00 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Jun 2016 18:00:30 +0000 (14:00 -0400)

Trivial merge