Merge branch 'hotfix/1.5.2' v1.5.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 31 Aug 2016 13:28:18 +0000 (09:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 31 Aug 2016 13:28:18 +0000 (09:28 -0400)

Trivial merge