Merge branch 'hotfix/1.2.7' v1.2.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 20:56:48 +0000 (16:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 20:56:48 +0000 (16:56 -0400)

Trivial merge