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

Trivial merge