Merge branch 'hotfix/1.1.15' v1.1.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 14:07:34 +0000 (09:07 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 14:07:34 +0000 (09:07 -0500)

Trivial merge