Merge branch 'hotfix/1.2.6' v1.2.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Jun 2016 15:17:56 +0000 (11:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Jun 2016 15:17:56 +0000 (11:17 -0400)

Trivial merge