Merge branch 'hotfix/1.2.27' v1.2.28
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 18:14:04 +0000 (14:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 18:14:04 +0000 (14:14 -0400)

Trivial merge