Merge branch 'hotfix/1.1.13' v1.1.13
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 26 Jan 2017 20:31:53 +0000 (15:31 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 26 Jan 2017 20:31:53 +0000 (15:31 -0500)

Trivial merge