Merge branch 'hotfix/1.2.9' v1.2.9
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 19 Jul 2016 17:09:13 +0000 (13:09 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 19 Jul 2016 17:09:13 +0000 (13:09 -0400)

Trivial merge