Merge branch 'master' into coreyk
Merge branch 'master' into coreyk
fixed one last thing on index blade
Merge branch 'master' into coreyk