Update to class
notice
Merge branch 'master' of https://github.com/Dingi/GitMergeTestStuff
Revert "Merge branch 'master' of https://github.com/Dingi/GitMergeTestStuff"

This reverts commit 000522c763a28c71b24869b09ff7bfc34e765fa2, reversing
changes made to cf38c8f99caed365819d0fd0cd79ccac973fd20d.
Merge remote-tracking branch 'origin/master' into HerpDerp