Merge branch 'hotfix/1.2.9'
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 20 Sep 2016 13:51:00 +0000 (09:51 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 20 Sep 2016 13:51:00 +0000 (09:51 -0400)

Trivial merge