Merge branch 'hotfix/1.0.5' v1.0.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 20 Jan 2017 15:46:04 +0000 (10:46 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 20 Jan 2017 15:46:04 +0000 (10:46 -0500)

Trivial merge