Small improvements.

Signed-off-by: crynobone <crynobone@gmail.com>
Fixes testcase.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.2'

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	src/Notifier/NotifiableTrait.php