Fix dependencies.
Fix version.
Fix branch alias.
Fix conflicts. Merge.
Fix version.
Merge.
Update components branch alias for dev-master.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge pull request #2929 from crynobone/patch/alias

Update components branch alias for dev-master.
Fix conflicts. Merge.
Fix bugs and merge.
Merging. Fixing conflicts.
Fix docblock
Update changes.json

The changes of 4.1 were marked as 4.2's changes...
Merge pull request #3012 from Youpie/patch-1

Fix docblock
Merge pull request #3014 from Nirlah/patch-1

Update changes.json
Merge branch '4.1'
Merge branch '4.1'
fix conflict.
fix conflicts.
Merge branch '4.1'