Fixed class name.
Merge branch 'master' into feature/networking