Merge branch 'release/2.2.1' into Development
After a small fix for my Facebook-implementation. This  should work in theory.
Still NOT a good solution, but it works with the given module.
Merge branch 'release/2.2.2'