Merge branch 'hotfix/1.1.17' v1.1.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 31 Oct 2016 18:59:27 +0000 (14:59 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 31 Oct 2016 18:59:27 +0000 (14:59 -0400)

Trivial merge