Merge branch 'hotfix/1.2.7' v1.2.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Feb 2017 20:14:08 +0000 (15:14 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Feb 2017 20:14:08 +0000 (15:14 -0500)

Trivial merge