Merge branch 'hotfix/1.0.17'
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 17 Feb 2016 21:18:05 +0000 (16:18 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 17 Feb 2016 21:18:05 +0000 (16:18 -0500)

Trivial merge