merged latest changes from original

Merge branch 'master' into sub-anonymous-l5.5

# Conflicts:
#	src/CanComment.php
#	src/Models/Comment.php