#4 - Bad merge and fixing abstract inheritance issues
Merge branch '#4'

Conflicts:
	Subscribers/AbstractDoctrineEncryptSubscriber.php