Merge branch 'hotfix/1.2.7' v1.2.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Jun 2016 16:37:26 +0000 (12:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Jun 2016 16:37:26 +0000 (12:37 -0400)

Trivial merge